summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-03-15 20:20:43 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-03-15 20:20:43 +0000
commit114010020db8185a708ae738108cf94e5781f763 (patch)
tree7452c6321c4c2359dd2a68cdea48b27bf3fd7b43 /sys/arch/sparc
parent5865561d7530fb306bbf34cd2570a436ca7ae4e4 (diff)
Nuke dk_establish(), no longer used.
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/dev/fd.c5
-rw-r--r--sys/arch/sparc/dev/xd.c4
-rw-r--r--sys/arch/sparc/dev/xy.c4
-rw-r--r--sys/arch/sparc/sparc/disksubr.c11
4 files changed, 4 insertions, 20 deletions
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 47f01a2a5af..77d353c2e3b 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.43 2006/01/22 00:40:02 miod Exp $ */
+/* $OpenBSD: fd.c,v 1.44 2006/03/15 20:20:41 miod Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -682,9 +682,6 @@ fdattach(parent, self, aux)
/* Make sure the drive motor gets turned off at shutdown time. */
fd->sc_sdhook = shutdownhook_establish(fd_motor_off, fd);
-
- /* XXX Need to do some more fiddling with sc_dk. */
- dk_establish(&fd->sc_dk, &fd->sc_dv);
}
__inline struct fd_type *
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index 4b0bc5c8cab..3775891e696 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xd.c,v 1.31 2006/01/20 23:27:25 miod Exp $ */
+/* $OpenBSD: xd.c,v 1.32 2006/03/15 20:20:41 miod Exp $ */
/* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */
/*
@@ -729,8 +729,6 @@ xdattach(parent, self, aux)
bp->dev = &xd->sc_dev;
}
- dk_establish(&xd->sc_dk, &xd->sc_dev); /* XXX */
-
done:
xd->state = newstate;
if (!xa->booting) {
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index 7731dd7644b..1bb7c02d399 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xy.c,v 1.27 2006/01/20 23:27:25 miod Exp $ */
+/* $OpenBSD: xy.c,v 1.28 2006/03/15 20:20:41 miod Exp $ */
/* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */
/*
@@ -689,8 +689,6 @@ xyattach(parent, self, aux)
bp->dev = &xy->sc_dev;
}
- dk_establish(&xy->sc_dk, &xy->sc_dev); /* XXX */
-
done:
xy->state = newstate;
if (!xa->booting) {
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index 45048b38351..127d6b7a8a0 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.38 2006/03/15 20:07:28 miod Exp $ */
+/* $OpenBSD: disksubr.c,v 1.39 2006/03/15 20:20:41 miod Exp $ */
/* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
/*
@@ -53,15 +53,6 @@ static char *disklabel_sun_to_bsd(char *, struct disklabel *);
static int disklabel_bsd_to_sun(struct disklabel *, char *);
static __inline u_long sun_extended_sum(struct sun_disklabel *);
-extern struct device *bootdv;
-
-void
-dk_establish(dk, dev)
- struct disk *dk;
- struct device *dev;
-{
-}
-
#if NCD > 0
/* XXX for comparison below. */
extern void cdstrategy(struct buf *);