Nuke dk_establish(), no longer used.

36 files changed, 45 insertions, 191 deletions

diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 91b0b6b2227..515dc643045 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.42 2005/12/22 03:02:48 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.43 2006/03/15 20:20:37 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -78,13 +78,6 @@ char   *readamigalabel(struct buf *, void (*)(struct buf *),
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
 
 /*
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index fbe76157fee..a599596444b 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.7 2006/03/04 19:33:20 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.8 2006/03/15 20:20:38 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,13 +41,6 @@
 #include <sys/syslog.h>
 #include <sys/disk.h>
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 3efd3f0e4d1..ed3913170a5 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.7 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.8 2006/03/15 20:20:39 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,13 +41,6 @@
 #include <sys/syslog.h>
 #include <sys/disk.h>
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 2a083eab0fb..d4c437cd61b 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.39 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.40 2006/03/15 20:20:39 miod Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -314,8 +314,6 @@ hdattach(parent, self, aux)
 
 	/* Initialize timeout structure */
 	timeout_set(&sc->sc_timeout, hdrestart, sc);
-
-	dk_establish(&sc->sc_dkdev, &sc->sc_dev);	/* XXX */
 }
 
 int
diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c
index aefbeeede50..ac7ec652c63 100644
--- a/sys/arch/hp300/hp300/disksubr.c
+++ b/sys/arch/hp300/hp300/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.18 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.19 2006/03/15 20:20:39 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $	*/
 
 /*
@@ -44,13 +44,6 @@
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 /*
  * Attempt to read a disk label from a device using the indicated strategy
  * routine.  The label must be partly set up before this: secpercyl and
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 2b350ea8c8a..7052298e23c 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.22 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.23 2006/03/15 20:20:39 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -86,13 +86,6 @@ char   *readliflabel(struct buf *, void (*)(struct buf *),
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 
 /*
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 6653569d70f..dd6b18644dd 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.5 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.6 2006/03/15 20:20:39 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -86,13 +86,6 @@ char   *readliflabel(struct buf *, void (*)(struct buf *),
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL)
 
 /*
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index ee7f723f2c7..8f324448c54 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.48 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.49 2006/03/15 20:20:39 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -41,13 +41,6 @@
 #include <sys/syslog.h>
 #include <sys/disk.h>
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index 9e16f4984b4..127006135f1 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.6 2006/01/26 07:11:08 miod Exp $ */
+/* $OpenBSD: disksubr.c,v 1.7 2006/03/15 20:20:39 miod Exp $ */
 /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
 
 /*
@@ -338,13 +338,6 @@ bad:
 	return (-1);
 }
 
-void
-dk_establish(dk, dev)
-        struct disk *dk;
-        struct device *dev;
-{
-}
-
 /************************************************************************
  *
  * The rest of this was taken from arch/sparc/scsi/sun_disklabel.c
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index 9d7084e7bfc..0299749af9d 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.28 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.29 2006/03/15 20:20:40 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $	*/
 
 /*
@@ -607,10 +607,3 @@ bad:
 done:
 	return (0);
 }
-
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index fcd243db339..4f625285aa8 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.15 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.16 2006/03/15 20:20:40 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -44,11 +44,6 @@
 #define BOOT_MAGIC 0xAA55
 #define BOOT_MAGIC_OFF (DOSPARTOFF+NDOSPART*sizeof(struct dos_partition))
 
-void
-dk_establish(struct disk *dk, struct device *dev)
-{
-}
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 1284ae3a8c9..a5e9f1e9fd4 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.11 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.12 2006/03/15 20:20:40 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -93,13 +93,6 @@ void map_sgi_label(struct disklabel *, struct sgilabel *);
 
 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 };
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL)
 
 /*
diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c
index 82970a76da8..69f66c71054 100644
--- a/sys/arch/mvme68k/dev/sshdma.c
+++ b/sys/arch/mvme68k/dev/sshdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshdma.c,v 1.12 2005/11/24 22:43:16 miod Exp $ */
+/*	$OpenBSD: sshdma.c,v 1.13 2006/03/15 20:20:40 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -171,11 +171,11 @@ void *auxp;
 
 	/*
 	 * attach all scsi units on us, watching for boot device
-	 * (see dk_establish).
+	 * (see device_register).
 	 */
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr)
-		bootpart = -1;				/* invalid flag to dk_establish */
+		bootpart = -1;		/* invalid flag to device_register */
 	config_found(self, &sc->sc_link, scsiprint);
 	bootpart = tmp;				 /* restore old value */
 
diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c
index b6b7bdde561..4b9b6100502 100644
--- a/sys/arch/mvme68k/dev/vsdma.c
+++ b/sys/arch/mvme68k/dev/vsdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsdma.c,v 1.10 2005/11/24 22:43:16 miod Exp $ */
+/*	$OpenBSD: vsdma.c,v 1.11 2006/03/15 20:20:40 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -131,11 +131,11 @@ vsattach(parent, self, auxp)
 
 	/*
 	 * attach all scsi units on us, watching for boot device
-	 * (see dk_establish).
+	 * (see device_register).
 	 */
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr) 
-		bootpart = -1;          /* invalid flag to dk_establish */
+		bootpart = -1;          /* invalid flag to device_register */
 	config_found(self, &sc->sc_link, scsiprint);
 	bootpart = tmp;             /* restore old value */
 }
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index 2eb6cad82b9..dac765ad0f7 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdsc.c,v 1.11 2004/07/30 22:29:45 miod Exp $ */
+/*	$OpenBSD: wdsc.c,v 1.12 2006/03/15 20:20:40 miod Exp $ */
 
 /*
  * Copyright (c) 1996 Steve Woodford
@@ -169,7 +169,7 @@ wdscattach(parent, self, aux)
 
 	/*
 	 * Attach all scsi units on us, watching for boot device
-	 * (see dk_establish).
+	 * (see device_register).
 	 */
 	tmp = bootpart;
 	if (ca->ca_paddr != bootaddr) 
diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c
index 04d389b0363..4a12ae71cbf 100644
--- a/sys/arch/mvme68k/mvme68k/disksubr.c
+++ b/sys/arch/mvme68k/mvme68k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.33 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.34 2006/03/15 20:20:40 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -48,14 +48,6 @@ static void printlp(struct disklabel *lp, char *str);
 static void printclp(struct cpu_disklabel *clp, char *str);
 #endif
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index 91eb77ddf23..f5ec640a562 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.60 2005/12/27 22:48:01 miod Exp $	*/
+/*	$OpenBSD: vs.c,v 1.61 2006/03/15 20:20:40 miod Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -208,11 +208,11 @@ vsattach(struct device *parent, struct device *self, void *args)
 
 	/*
 	 * Attach all scsi units on us, watching for boot device
-	 * (see dk_establish).
+	 * (see device_register).
 	 */
 	tmp = bootpart;
 	if (sc->sc_paddr != bootaddr)
-		bootpart = -1;		/* invalid flag to dk_establish */
+		bootpart = -1;		/* invalid flag to device_register */
 
 	for (bus = 0; bus < 2; bus++) {
 		if (sc->sc_id[bus] < 0)
diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c
index aa93e41e0ef..46f55bedb14 100644
--- a/sys/arch/mvme88k/mvme88k/disksubr.c
+++ b/sys/arch/mvme88k/mvme88k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.31 2006/01/22 00:40:01 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.32 2006/03/15 20:20:40 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -46,14 +46,6 @@ void printlp(struct disklabel *, char *);
 void printclp(struct cpu_disklabel *, char *);
 #endif
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index f6a3ca3b2ba..91238d9c4a3 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.11 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.12 2006/03/15 20:20:40 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -44,13 +44,6 @@
 #define BOOT_MAGIC 0xAA55
 #define BOOT_MAGIC_OFF (DOSPARTOFF+NDOSPART*sizeof(struct dos_partition))
 
-void
-dk_establish(dk, dev)
-	struct disk *dk;
-	struct device *dev;
-{
-}
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated strategy routine.
diff --git a/sys/arch/solbourne/solbourne/autoconf.c b/sys/arch/solbourne/solbourne/autoconf.c
index e118435908c..336f4c0db9e 100644
--- a/sys/arch/solbourne/solbourne/autoconf.c
+++ b/sys/arch/solbourne/solbourne/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.3 2005/12/27 18:31:10 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.4 2006/03/15 20:20:40 miod Exp $	*/
 /*	OpenBSD: autoconf.c,v 1.64 2005/03/23 17:10:24 miod Exp 	*/
 
 /*
@@ -257,7 +257,7 @@ bootpath_build()
  *
  * XXX. required because of SCSI... we don't have control over the "sd"
  * device, so we can't set boot device there.   we patch in with
- * dk_establish(), and use this to recover the bootpath.
+ * device_register(), and use this to recover the bootpath.
  */
 
 struct bootpath *
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 *);
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 406dc7d7f96..750966ffab7 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.5 2006/01/22 00:40:02 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.6 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -681,9 +681,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/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index a00367ed006..663a1439055 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.44 2006/02/06 17:19:31 jmc Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.45 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -426,7 +426,7 @@ bootpath_print(bp)
  *
  * XXX. required because of SCSI... we don't have control over the "sd"
  * device, so we can't set boot device there.   we patch in with
- * dk_establish(), and use this to recover the bootpath.
+ * device_register(), and use this to recover the bootpath.
  */
 struct bootpath *
 bootpath_store(storep, bp)
diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c
index a236b85ea00..e8ab0f78753 100644
--- a/sys/arch/sparc64/sparc64/disksubr.c
+++ b/sys/arch/sparc64/sparc64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.16 2006/03/04 19:33:21 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.17 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */
 
 /*
@@ -55,12 +55,6 @@ static __inline u_int sun_extended_sum(struct sun_disklabel *);
 
 extern struct device *bootdv;
 
-void
-dk_establish(struct disk *dk, struct device *dev)
-{
-	/* fix later */
-}
-
 #if NCD > 0
 extern void cdstrategy(struct buf *);
 #endif
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index 4409b04072c..466b41e4dc3 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.26 2006/01/20 23:27:26 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.27 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $	*/
 
 /*
@@ -182,13 +182,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly)
 	return (msg);
 }
 
-void 
-dk_establish(p, q)
-	struct disk *p;
-	struct device *q;
-{
-}
-
 /*
  * Check new disk label for sensibility
  * before setting it.
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index ef58b4e79ca..ea26c1fd57a 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.52 2006/01/22 00:40:02 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.53 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -278,7 +278,6 @@ fdattach(parent, self, aux)
 	fd->sc_dk.dk_driver = &fddkdriver;
 	disk_attach(&fd->sc_dk);
 
-	dk_establish(&fd->sc_dk, &fd->sc_dev);
 	/* Needed to power off if the motor is on when we halt. */
 	fd->sc_sdhook = shutdownhook_establish(fd_motor_off, fd);
 
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 8222c2ddc53..7207a858464 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.38 2006/03/10 18:13:10 miod Exp $ */
+/*	$OpenBSD: mcd.c,v 1.39 2006/03/15 20:20:41 miod Exp $ */
 /*	$NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $	*/
 
 /*
@@ -253,8 +253,6 @@ mcdattach(parent, self, aux)
 	sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
 	disk_attach(&sc->sc_dk);
 
-	dk_establish(&sc->sc_dk, &sc->sc_dev);
-
 	printf(": model %s\n", sc->type != 0 ? sc->type : "unknown");
 
 	(void) mcd_setlock(sc, MCD_LK_UNLOCK);
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index e63668ae142..5deea0c8146 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdisk.c,v 1.9 2004/11/29 12:50:05 jsg Exp $	*/
+/*	$OpenBSD: ofdisk.c,v 1.10 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: ofdisk.c,v 1.3 1996/10/13 01:38:13 christos Exp $	*/
 
 /*
@@ -98,7 +98,6 @@ ofdattach(struct device *parent, struct device *self, void *aux)
 	of->sc_dk.dk_name = of->sc_name;
 	strlcpy(of->sc_name, of->sc_dev.dv_xname, sizeof of->sc_name);
 	disk_attach(&of->sc_dk);
-	dk_establish(&of->sc_dk, self);				/* XXX */
 	printf("\n");
 }
 
diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index b85322888fc..1d203899a21 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofnet.c,v 1.9 2004/11/29 12:50:05 jsg Exp $	*/
+/*	$OpenBSD: ofnet.c,v 1.10 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: ofnet.c,v 1.4 1996/10/16 19:33:21 ws Exp $	*/
 
 /*
@@ -164,8 +164,6 @@ printf("\nethernet dev: path %s\n", path);
 
 	if_attach(ifp);
 	ether_ifattach(ifp);
-
-	dk_establish(0, self);					/* XXX */
 }
 
 static void
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 8ee2531b1d9..8ec9ff2159d 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.59 2006/03/04 22:53:32 pedro Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.60 2006/03/15 20:20:41 miod Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -873,7 +873,6 @@ vndioctl(dev, cmd, addr, flag, p)
 		vnd->sc_dk.dk_driver = &vnddkdriver;
 		vnd->sc_dk.dk_name = vnd->sc_dev.dv_xname;
 		disk_attach(&vnd->sc_dk);
-		dk_establish(&vnd->sc_dk, &vnd->sc_dev);
 
 		vndunlock(vnd);
 
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 1ac999d766d..af6787de82a 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.105 2006/03/04 19:33:22 miod Exp $	*/
+/*	$OpenBSD: cd.c,v 1.106 2006/03/15 20:20:42 miod Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -213,8 +213,6 @@ cdattach(parent, self, aux)
 	cd->sc_dk.dk_name = cd->sc_dev.dv_xname;
 	disk_attach(&cd->sc_dk);
 
-	dk_establish(&cd->sc_dk, &cd->sc_dev);
-  
 	/*
 	 * Note if this device is ancient.  This is used in cdminphys().
 	 */
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index f504840f75e..51448cdb7dc 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.103 2006/03/05 14:58:10 krw Exp $	*/
+/*	$OpenBSD: sd.c,v 1.104 2006/03/15 20:20:42 miod Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -189,8 +189,6 @@ sdattach(parent, self, aux)
 	sd->sc_dk.dk_name = sd->sc_dev.dv_xname;
 	disk_attach(&sd->sc_dk);
 
-	dk_establish(&sd->sc_dk, &sd->sc_dev);
-
 	if ((sc_link->flags & SDEV_ATAPI) && (sc_link->flags & SDEV_REMOVABLE))
 		sc_link->quirks |= SDEV_NOSYNCCACHE;
 
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index faee1a48995..0d1931d8972 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.h,v 1.12 2004/02/15 02:45:46 tedu Exp $	*/
+/*	$OpenBSD: disk.h,v 1.13 2006/03/15 20:20:42 miod Exp $	*/
 /*	$NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $	*/
 
 /*
@@ -167,7 +167,4 @@ struct	disk *disk_find(char *);
 
 int	disk_lock(struct disk *);
 void    disk_unlock(struct disk *);
-
-struct device;
-void	dk_establish(struct disk *, struct device *);
 #endif