Remove now unused zeroref member in cfattach structures.

3 files changed, 5 insertions, 16 deletions

diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index ad6120913e3..b0393ca867a 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.31 2005/12/08 05:53:45 tedu Exp $	*/
+/* $OpenBSD: rf_openbsdkintf.c,v 1.32 2006/01/21 12:20:51 miod Exp $	*/
 /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $	*/
 
 /*-
@@ -238,11 +238,10 @@ int  rf_probe(struct device *, void *, void *);
 void rf_attach(struct device *, struct device *, void *);
 int  rf_detach(struct device *, int);
 int  rf_activate(struct device *, enum devact);
-void rf_zeroref(struct device *);
 
 struct cfattach raid_ca = {
 	sizeof(struct raid_softc), rf_probe, rf_attach,
-	rf_detach, rf_activate, rf_zeroref
+	rf_detach, rf_activate
 };
 
 /*
@@ -346,11 +345,6 @@ rf_activate(struct device *self, enum devact act)
 }
 
 void
-rf_zeroref(struct device *self)
-{
-}
-
-void
 raidattach(int num)
 {
 	int raidID;
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index fc58c93f7eb..befee4036e3 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_autoconf.c,v 1.42 2006/01/13 19:22:54 miod Exp $	*/
+/*	$OpenBSD: subr_autoconf.c,v 1.43 2006/01/21 12:20:53 miod Exp $	*/
 /*	$NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $	*/
 
 /*
@@ -829,8 +829,7 @@ device_ref(struct device *dv)
 /*
  * Decrement the ref count on the device structure.
  *
- * free's the structure when the ref count hits zero and calls the zeroref
- * function.
+ * free's the structure when the ref count hits zero.
  *
  * Context: process or interrupt
  */
@@ -839,9 +838,6 @@ device_unref(struct device *dv)
 {
 	dv->dv_ref--;
 	if (dv->dv_ref == 0) {
-		if (dv->dv_cfdata->cf_attach->ca_zeroref)
-			(*dv->dv_cfdata->cf_attach->ca_zeroref)(dv);
-		
 		free(dv, M_DEVBUF);
 	}
 }
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 95ea9f12939..b6bf69dd47e 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.29 2004/11/23 19:08:55 miod Exp $	*/
+/*	$OpenBSD: device.h,v 1.30 2006/01/21 12:20:53 miod Exp $	*/
 /*	$NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $	*/
 
 /*
@@ -140,7 +140,6 @@ struct cfattach {
 	void	(*ca_attach)(struct device *, struct device *, void *);
 	int	(*ca_detach)(struct device *, int);
 	int	(*ca_activate)(struct device *, enum devact);
-	void    (*ca_zeroref)(struct device *);
 };
 
 /* Flags given to config_detach(), and the ca_detach function. */