- consistify cfdriver for the ethernet drivers (0 -> NULL)

ok dlg@

26 files changed, 53 insertions, 53 deletions

diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 34669556d26..f745e6740d6 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.27 2008/11/28 02:44:17 brad Exp $ */
+/* $OpenBSD: if_bce.c,v 1.28 2009/08/13 14:24:47 jasper Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -205,7 +205,7 @@ struct cfattach bce_ca = {
 	sizeof(struct bce_softc), bce_probe, bce_attach
 };
 struct cfdriver bce_cd = {
-	0, "bce", DV_IFNET
+	NULL, "bce", DV_IFNET
 };
 
 const struct pci_matchid bce_devices[] = {
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 8f8986974f1..ca36f456a56 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.280 2009/08/09 11:40:56 deraadt Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.281 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -133,7 +133,7 @@ struct cfattach bge_ca = {
 };
 
 struct cfdriver bge_cd = {
-	0, "bge", DV_IFNET
+	NULL, "bge", DV_IFNET
 };
 
 void bge_txeof(struct bge_softc *);
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 3bf0151bdf1..06fc5dbe256 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnx.c,v 1.83 2009/08/09 11:40:56 deraadt Exp $	*/
+/*	$OpenBSD: if_bnx.c,v 1.84 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -403,7 +403,7 @@ struct cfattach bnx_ca = {
 };
 
 struct cfdriver bnx_cd = {
-	0, "bnx", DV_IFNET
+	NULL, "bnx", DV_IFNET
 };
 
 /****************************************************************************/
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index c2357261601..3f2822b6b02 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.102 2009/06/19 14:13:41 naddy Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.103 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -137,7 +137,7 @@ struct cfattach de_ca = {
 };
 
 struct cfdriver de_cd = {
-	0, "de", DV_IFNET
+	NULL, "de", DV_IFNET
 };
 
 void tulip_timeout_callback(void *arg);
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index c15a6be13b7..56c4d5d69b8 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.219 2009/08/12 20:02:42 dlg Exp $ */
+/* $OpenBSD: if_em.c,v 1.220 2009/08/13 14:24:47 jasper Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -223,7 +223,7 @@ struct cfattach em_ca = {
 };
 
 struct cfdriver em_cd = {
-	0, "em", DV_IFNET
+	NULL, "em", DV_IFNET
 };
 
 static int em_smart_pwr_down = FALSE;
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index b67a937aac8..6d95ed75937 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fpa.c,v 1.25 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: if_fpa.c,v 1.26 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $	*/
 
 /*-
@@ -183,5 +183,5 @@ struct cfattach fpa_ca = {
 };
 
 struct cfdriver fpa_cd = {
-	0, "fpa", DV_IFNET
+	NULL, "fpa", DV_IFNET
 };
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index b86c61e7595..756c51a4692 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ix.c,v 1.29 2009/08/12 20:02:42 dlg Exp $	*/
+/*	$OpenBSD: if_ix.c,v 1.30 2009/08/13 14:24:47 jasper Exp $	*/
 
 /******************************************************************************
 
@@ -134,7 +134,7 @@ void	desc_flip(void *);
  *********************************************************************/
 
 struct cfdriver ix_cd = {
-	0, "ix", DV_IFNET
+	NULL, "ix", DV_IFNET
 };
 
 struct cfattach ix_ca = {
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index 2d934d86cd8..6530efa8c44 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.c,v 1.54 2009/08/10 19:41:05 deraadt Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.55 2009/08/13 14:24:47 jasper Exp $ */
 
 #include <dev/pci/if_ixgb.h>
 
@@ -125,7 +125,7 @@ struct cfattach ixgb_ca = {
 };
 
 struct cfdriver ixgb_cd = {
-	0, "ixgb", DV_IFNET
+	NULL, "ixgb", DV_IFNET
 };
 
 /* some defines for controlling descriptor fetches in h/w */
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index a3d02c89bc7..9d26a7442d0 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.51 2009/08/10 17:25:07 deraadt Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.52 2009/08/13 14:24:47 jasper Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -123,7 +123,7 @@ struct cfattach lge_ca = {
 };
 
 struct cfdriver lge_cd = {
-	0, "lge", DV_IFNET
+	NULL, "lge", DV_IFNET
 };
 
 int lge_alloc_jumbo_mem(struct lge_softc *);
diff --git a/sys/dev/pci/if_lmc_obsd.c b/sys/dev/pci/if_lmc_obsd.c
index 6b73e56fa24..197249bb74a 100644
--- a/sys/dev/pci/if_lmc_obsd.c
+++ b/sys/dev/pci/if_lmc_obsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lmc_obsd.c,v 1.19 2005/11/07 00:29:21 brad Exp $ */
+/*	$OpenBSD: if_lmc_obsd.c,v 1.20 2009/08/13 14:24:47 jasper Exp $ */
 /*	$NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $	*/
 
 /*-
@@ -153,7 +153,7 @@ struct cfattach lmc_ca = {
 };
 
 struct cfdriver lmc_cd = {
-	0, "lmc", DV_IFNET
+	NULL, "lmc", DV_IFNET
 };
 
 static void
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 387837302e0..626721eb0d7 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.76 2009/08/09 11:40:56 deraadt Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.77 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -2104,7 +2104,7 @@ struct cfattach mskc_ca = {
 };
 
 struct cfdriver mskc_cd = {
-	0, "mskc", DV_DULL
+	NULL, "mskc", DV_DULL
 };
 
 struct cfattach msk_ca = {
@@ -2112,7 +2112,7 @@ struct cfattach msk_ca = {
 };
 
 struct cfdriver msk_cd = {
-	0, "msk", DV_IFNET
+	NULL, "msk", DV_IFNET
 };
 
 #ifdef MSK_DEBUG
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index 2645c20b5c5..590726936f9 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_myx.c,v 1.10 2008/11/28 02:44:18 brad Exp $	*/
+/*	$OpenBSD: if_myx.c,v 1.11 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -180,7 +180,7 @@ void	 myx_free_rings(struct myx_softc *);
 struct mbuf *myx_getbuf(struct myx_softc *, bus_dmamap_t, int);
 
 struct cfdriver myx_cd = {
-	0, "myx", DV_IFNET
+	NULL, "myx", DV_IFNET
 };
 struct cfattach myx_ca = {
 	sizeof(struct myx_softc), myx_match, myx_attach
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index 9427b44cf43..54996d893bb 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.67 2008/11/28 02:44:18 brad Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.68 2009/08/13 14:24:47 jasper Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -2239,5 +2239,5 @@ struct cfattach nge_ca = {
 };
 
 struct cfdriver nge_cd = {
-	0, "nge", DV_IFNET
+	NULL, "nge", DV_IFNET
 };
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 268e6f19730..0e275ee1ce7 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.21 2008/11/28 02:44:18 brad Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.22 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -489,7 +489,7 @@ const struct pci_matchid pcn_devices[] = {
 };
 
 struct cfdriver pcn_cd = {
-	0, "pcn", DV_IFNET
+	NULL, "pcn", DV_IFNET
 };
 
 /*
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 75db5e4842d..7ba68968ae9 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sis.c,v 1.96 2009/08/10 19:41:05 deraadt Exp $ */
+/*	$OpenBSD: if_sis.c,v 1.97 2009/08/13 14:24:47 jasper Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -110,7 +110,7 @@ struct cfattach sis_ca = {
 };
 
 struct cfdriver sis_cd = {
-	0, "sis", DV_IFNET
+	NULL, "sis", DV_IFNET
 };
 
 int sis_intr(void *);
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index f6bda5d48ca..ed97182d994 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.152 2009/07/08 20:18:05 sthen Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.153 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -2782,7 +2782,7 @@ struct cfattach sk_ca = {
 };
 
 struct cfdriver sk_cd = {
-	0, "sk", DV_IFNET
+	NULL, "sk", DV_IFNET
 };
 
 #ifdef SK_DEBUG
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index f224236425f..bd4165eb212 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.44 2009/08/10 19:41:05 deraadt Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.45 2009/08/13 14:24:47 jasper Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -146,7 +146,7 @@ struct cfattach ste_ca = {
 };
 
 struct cfdriver ste_cd = {
-	0, "ste", DV_IFNET
+	NULL, "ste", DV_IFNET
 };
 
 /*
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 02b0f3b1534..ea7d4aae06e 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stge.c,v 1.49 2009/08/10 19:41:05 deraadt Exp $	*/
+/*	$OpenBSD: if_stge.c,v 1.50 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $	*/
 
 /*-
@@ -122,7 +122,7 @@ struct cfattach stge_ca = {
 };
 
 struct cfdriver stge_cd = {
-	0, "stge", DV_IFNET
+	NULL, "stge", DV_IFNET
 };
 
 uint32_t stge_mii_bitbang_read(struct device *);
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 1c0c0758a4a..187dd8b25ef 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti.c,v 1.97 2009/08/11 23:58:35 martynas Exp $	*/
+/*	$OpenBSD: if_ti.c,v 1.98 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -122,7 +122,7 @@ struct cfattach ti_ca = {
 };
 
 struct cfdriver ti_cd = {
-	0, "ti", DV_IFNET
+	NULL, "ti", DV_IFNET
 };
 
 void ti_txeof_tigon1(struct ti_softc *);
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 0c20c3eb656..69b0bc04c76 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.48 2009/08/10 19:41:05 deraadt Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.49 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -2193,5 +2193,5 @@ struct cfattach tl_ca = {
 };
 
 struct cfdriver tl_cd = {
-	0, "tl", DV_IFNET
+	NULL, "tl", DV_IFNET
 };
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index e35f0dbd709..be4333bc477 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txp.c,v 1.100 2009/03/24 11:12:10 kettenis Exp $	*/
+/*	$OpenBSD: if_txp.c,v 1.101 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 2001
@@ -133,7 +133,7 @@ struct cfattach txp_ca = {
 };
 
 struct cfdriver txp_cd = {
-	0, "txp", DV_IFNET
+	NULL, "txp", DV_IFNET
 };
 
 const struct pci_matchid txp_devices[] = {
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index f924e701d4d..d47b76431bc 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.43 2008/11/28 02:44:18 brad Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.44 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -168,7 +168,7 @@ struct cfattach vge_ca = {
 };
 
 struct cfdriver vge_cd = {
-	0, "vge", DV_IFNET
+	NULL, "vge", DV_IFNET
 };
 
 #define VGE_PCI_LOIO             0x10
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 5defda26a0b..e41b2c7b874 100644
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vic.c,v 1.73 2009/08/10 17:25:07 deraadt Exp $	*/
+/*	$OpenBSD: if_vic.c,v 1.74 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -303,7 +303,7 @@ struct vic_softc {
 };
 
 struct cfdriver vic_cd = {
-	0, "vic", DV_IFNET
+	NULL, "vic", DV_IFNET
 };
 
 int		vic_match(struct device *, void *, void *);
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index f4b17689899..234ee7b1220 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.99 2009/08/10 19:41:05 deraadt Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.100 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -108,7 +108,7 @@ struct cfattach vr_ca = {
 	sizeof(struct vr_softc), vr_probe, vr_attach
 };
 struct cfdriver vr_cd = {
-	0, "vr", DV_IFNET
+	NULL, "vr", DV_IFNET
 };
 
 int vr_encap(struct vr_softc *, struct vr_chain *, struct mbuf *);
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 4cfea0ad730..e63819144c7 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.44 2009/08/10 19:41:05 deraadt Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.45 2009/08/13 14:24:47 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1691,5 +1691,5 @@ struct cfattach wb_ca = {
 };
 
 struct cfdriver wb_cd = {
-	0, "wb", DV_IFNET
+	NULL, "wb", DV_IFNET
 };
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index a5d42f705bc..73501206e35 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.50 2009/08/10 17:29:19 deraadt Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.51 2009/08/13 14:24:47 jasper Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -302,7 +302,7 @@ struct cfattach xge_ca = {
 };
 
 struct cfdriver xge_cd = {
-	0, "xge", DV_IFNET
+	NULL, "xge", DV_IFNET
 };
 
 #define XNAME sc->sc_dev.dv_xname