Simplify the COMPAT_PCI_DRIVER/DATA_SET hack. We can add:

#define COMPAT_PCI_DRIVER(name,data) DATA_SET(pcidevice_set,data)
.. to 2.2.x and 3.x if people think it's worth it.  Driver writers can do
this if it's not defined.  (The reason for this is that I'm trying to
progressively eliminate use of linker_sets where it hurts modularity and
runtime load capability, and these DATA_SET's keep getting in the way.)

31 files changed, 42 insertions, 164 deletions

diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 27bfc0d..73b8622 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.4 1998/12/22 18:14:15 gibbs Exp $
+ *	$Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
  */
 
 #include <pci.h>
@@ -95,11 +95,7 @@ static struct  pci_device adv_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (adv_pci, adv_pci_driver);
-#else
-DATA_SET (pcidevice_set, adv_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 advpciprobe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 6efed69..85e7c92 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $
+ *	$Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
  */
 
 #include <pci.h>
@@ -69,11 +69,7 @@ static struct  pci_device adw_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (adw_pci, adw_pci_driver);
-#else
-DATA_SET (pcidevice_set, adw_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 adwpciprobe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 4930fe3..d1bb5be 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpm.c,v 1.2 1999/04/24 20:13:58 peter Exp $
+ *	$Id: alpm.c,v 1.3 1999/05/08 21:59:37 dfr Exp $
  *
  */
 
@@ -205,11 +205,7 @@ static struct	pci_device alpm_device = {
 	&alpm_count
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (alpm, alpm_device);
-#else
-DATA_SET (pcidevice_set, alpm_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 alpm_pci_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index cb5093f..96533cd 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 roger Exp $ */
+/* $Id: brooktree848.c,v 1.73 1999/04/30 11:16:30 roger Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -527,11 +527,7 @@ static struct	pci_device bktr_device = {
 	&bktr_count
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (bktr, bktr_device);
-#else
-DATA_SET (pcidevice_set, bktr_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static	d_open_t	bktr_open;
 static	d_close_t	bktr_close;
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 203abc4..f6cd10c 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $
+ *	$Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $
  */
 
 /*
@@ -65,11 +65,7 @@ static struct pci_device cy_device = {
         &cy_count,
         NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(cy_pci, cy_device);
-#else
-DATA_SET(pcidevice_set, cy_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 cy_probe(config_id, device_id)
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 69ba362..3caaf45 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.11 1998/12/14 06:32:55 dillon Exp $"
+#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $"
 
 #include "opt_devfs.h"
 #include "opt_dpt.h"
@@ -78,11 +78,7 @@ static  struct pci_device dpt_pci_driver =
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(dpt_pci, dpt_pci_driver);
-#else
-DATA_SET(pcidevice_set, dpt_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Probe the PCI device.
diff --git a/sys/pci/es1370.c b/sys/pci/es1370.c
index f52afda..14b6518 100644
--- a/sys/pci/es1370.c
+++ b/sys/pci/es1370.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: es1370.c,v 1.2 1999/04/24 20:13:58 peter Exp $
+ *	$Id: es1370.c,v 1.3 1999/05/09 10:43:54 peter Exp $
  */
 
 #include "pci.h"
@@ -154,11 +154,7 @@ static struct pci_device es_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(es_pci, es_pci_driver);
-#else
-DATA_SET(pcidevice_set, es_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static snddev_info es_op_desc = {
 	"ENSONIQ AudioPCI",
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index 81fc318..c5d0798 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.32 1999/04/16 21:22:50 peter Exp $
+ *	$Id: ide_pci.c,v 1.33 1999/04/24 20:13:58 peter Exp $
  */
 
 #include "pci.h"
@@ -1672,11 +1672,7 @@ static struct pci_device ide_pci_device = {
 	0
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(ide_pci, ide_pci_device);
-#else
-DATA_SET(pcidevice_set, ide_pci_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Return a cookie if we may be able to do DMA on the specified
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index 5f33bc1..affe5f8 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $
+ *	$Id: if_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $
  */
 
 /*
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $";
+	"$Id: if_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $";
 #endif
 
 /*
@@ -2238,8 +2238,4 @@ static struct pci_device ax_device = {
 	&ax_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(ax, ax_device);
-#else
-DATA_SET(pcidevice_set, ax_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 8728d39..fef317c 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $	*/
-/*	$Id: if_de.c,v 1.103 1999/04/24 20:13:59 peter Exp $ */
+/*	$Id: if_de.c,v 1.104 1999/05/03 09:36:29 dfr Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5378,11 +5378,7 @@ static struct pci_device dedevice = {
 #endif
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(de, dedevice);
-#else
-DATA_SET (pcidevice_set, dedevice);
-#endif /* COMPAT_PCI_DRIVER */
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index ee47d80..c96fa25 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.14 1998/12/14 05:47:27 dillon Exp $
+ *	$Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
  */
 
 #include "pci.h"
@@ -64,11 +64,7 @@ static struct pci_device ed_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (ed_pci, ed_pci_driver);
-#else
-DATA_SET (pcidevice_set, ed_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 ed_pci_probe (pcici_t tag, pcidi_t type)
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 39d5d79..cb35267 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -114,11 +114,7 @@ static struct pci_device endevice = {
 	NULL,
 };  
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (en, endevice);
-#else
-DATA_SET (pcidevice_set, endevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * local defines (PCI specific stuff)
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 10ef90c..839b939 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.8 1998/12/14 06:32:55 dillon Exp $
+ * $Id: if_fpa.c,v 1.9 1999/04/24 20:14:00 peter Exp $
  *
  */
 
@@ -214,11 +214,7 @@ static struct pci_device fpadevice = {
     NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (fpa, fpadevice);
-#else
-DATA_SET (pcidevice_set, fpadevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 #elif defined(__bsdi__)
 
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 2715751..6b9605d 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.7 1998/12/14 06:32:55 dillon Exp $
+ *	$Id: if_lnc_p.c,v 1.8 1999/04/24 20:14:00 peter Exp $
  */
 
 #include "pci.h"
@@ -49,11 +49,7 @@ static struct pci_device lnc_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (lnc_pci, lnc_pci_driver);
-#else
-DATA_SET (pcidevice_set, lnc_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char*
 lnc_pci_probe (pcici_t tag, pcidi_t type)
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 1d73b3b..bbed8205 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mx.c,v 1.41 1999/05/06 15:07:10 wpaul Exp $
+ *	$Id: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $
  */
 
 /*
@@ -94,7 +94,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.41 1999/05/06 15:07:10 wpaul Exp $";
+	"$Id: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $";
 #endif
 
 /*
@@ -2491,8 +2491,4 @@ static struct pci_device mx_device = {
 	&mx_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(mx, mx_device);
-#else
-DATA_SET(pcidevice_set, mx_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 4f58759..5e83489 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $
+ *	$Id: if_pn.c,v 1.18 1999/04/24 20:14:00 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $";
+	"$Id: if_pn.c,v 1.18 1999/04/24 20:14:00 peter Exp $";
 #endif
 
 #ifdef __alpha__
@@ -2282,8 +2282,4 @@ static struct pci_device pn_device = {
 	&pn_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(pn, pn_device);
-#else
-DATA_SET(pcidevice_set, pn_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 5a5d334..890beb5 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $
+ *	$Id: if_rl.c,v 1.14 1999/04/24 20:14:01 peter Exp $
  */
 
 /*
@@ -127,7 +127,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $";
+	"$Id: if_rl.c,v 1.14 1999/04/24 20:14:01 peter Exp $";
 #endif
 
 /*
@@ -1914,8 +1914,4 @@ static struct pci_device rl_device = {
 	&rl_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(rl, rl_device);
-#else
-DATA_SET(pcidevice_set, rl_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 466a639..a7d34e9 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.7 1998/12/14 06:32:56 dillon Exp $
+ * $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
  */
 
 #include "pci.h"
@@ -65,13 +65,10 @@ static struct pci_device sr_pci_driver =
 	sr_pci_probe,
 	sr_pci_attach,
 	&src_count,
-	NULL};
+	NULL
+};
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (sr_pci, sr_pci_driver);
-#else
-DATA_SET (pcidevice_set, sr_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 sr_pci_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 212f345..2e3e766 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $
+ *	$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $";
+	"$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $";
 #endif
 
 /*
@@ -2483,8 +2483,4 @@ static struct pci_device ti_device = {
 	&ti_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(ti, ti_device);
-#else
-DATA_SET(pcidevice_set, ti_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 01fefbb..604b0c0 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $
+ *	$Id: if_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $
  */
 
 /*
@@ -221,7 +221,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $";
+	"$Id: if_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $";
 #endif
 
 /*
@@ -2830,8 +2830,4 @@ static struct pci_device tl_device = {
 	&tl_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(tl, tl_device);
-#else
-DATA_SET(pcidevice_set, tl_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 63d62ef..db5d268 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.24 1999/04/17 08:36:07 peter Exp $ */
+/*	$Id: if_tx.c,v 1.25 1999/04/24 20:14:01 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -389,14 +389,11 @@ static struct pci_device txdevice = {
 	epic_freebsd_probe,
 	epic_freebsd_attach,
 	&epic_pci_count,
-	NULL };
+	NULL
+};
 
 /* Append this driver to pci drivers list */
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (tx, txdevice);
-#else
-DATA_SET ( pcidevice_set, txdevice );
-#endif /* COMPAT_PCI_DRIVER */
 
 /* Synopsis: Check if device id corresponds with SMC83C170 id.  */
 static const char*
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index a88c6c6..725a9ee 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $
+ *	$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $";
+	"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
 #endif
 
 /*
@@ -1959,8 +1959,4 @@ static struct pci_device vr_device = {
 	&vr_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(vr, vr_device);
-#else
-DATA_SET(pcidevice_set, vr_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index 2c629bf..99cf279 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/if_vx_pci.c
@@ -137,11 +137,7 @@ static struct pci_device vxdevice = {
     NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (vx, vxdevice);
-#else
-DATA_SET (pcidevice_set, vxdevice);
-#endif /* COMPAT_PCI_DRIVER */
 
 #endif	/* NVX */
 #endif	/* NPCI */
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 02017ca..f3291e5 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $
+ *	$Id: if_wb.c,v 1.8 1999/04/24 20:14:02 peter Exp $
  */
 
 /*
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $";
+	"$Id: if_wb.c,v 1.8 1999/04/24 20:14:02 peter Exp $";
 #endif
 
 /*
@@ -2149,8 +2149,4 @@ static struct pci_device wb_device = {
 	&wb_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(wb, wb_device);
-#else
-DATA_SET(pcidevice_set, wb_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 931e84a..67d3c89 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xl.c,v 1.101 1999/05/05 16:54:54 wpaul Exp $
+ *	$Id: if_xl.c,v 1.36 1999/05/05 17:05:06 wpaul Exp $
  */
 
 /*
@@ -159,7 +159,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.101 1999/05/05 16:54:54 wpaul Exp $";
+	"$Id: if_xl.c,v 1.36 1999/05/05 17:05:06 wpaul Exp $";
 #endif
 
 /*
@@ -2930,8 +2930,4 @@ static struct pci_device xl_device = {
 	&xl_count,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(xl, xl_device);
-#else
-DATA_SET(pcidevice_set, xl_device);
-#endif /* COMPAT_PCI_DRIVER */
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index b7ce04d..9f53550 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.19 1999/04/11 02:47:31 eivind Exp $ */
+/* $Id: isp_pci.c,v 1.20 1999/04/24 20:14:02 peter Exp $ */
 /* release_4_3_99 */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@@ -271,11 +271,7 @@ static struct pci_device isp_pci_driver = {
 	&ispunit,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (isp_pci, isp_pci_driver);
-#else
-DATA_SET (pcidevice_set, isp_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 
 static PROBETYPE
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 1a1396a..7386eb3 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -208,11 +208,7 @@ static struct	pci_device met_device = {
 	&met_count
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (meteor, met_device);
-#else
-DATA_SET (pcidevice_set, met_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 #if defined(METEOR_FreeBSD_210)	/* XXX */
 d_open_t	meteor_open;
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 38dd843..3b7ccfc 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.143 1999/04/24 20:14:02 peter Exp $
+**  $Id: ncr.c,v 1.144 1999/05/06 20:16:37 ken Exp $
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1361,7 +1361,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$Id: ncr.c,v 1.143 1999/04/24 20:14:02 peter Exp $\n";
+	"\n$Id: ncr.c,v 1.144 1999/05/06 20:16:37 ken Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -1410,11 +1410,7 @@ static struct	pci_device ncr_device = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (ncr, ncr_device);
-#else
-DATA_SET (pcidevice_set, ncr_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static char *ncr_name (ncb_p np)
 {
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index a13734c..c726aa9 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.10 1999/04/24 20:14:03 peter Exp $
+ * $Id: pcic_p.c,v 1.11 1999/05/02 05:53:50 nate Exp $
  */
 
 #include "pci.h"
@@ -57,11 +57,7 @@ static struct pci_device pcic_pci_driver = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER(pcic_pci, pcic_pci_driver);
-#else
-DATA_SET(pcidevice_set, pcic_pci_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 /*
  * Return the ID string for the controller if the vendor/product id
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 4ad9bdf..7a9954b 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simos.c,v 1.4 1999/04/24 20:14:03 peter Exp $
+ *	$Id: simos.c,v 1.5 1999/05/06 20:16:39 ken Exp $
  */
 
 #include <sys/param.h>
@@ -82,11 +82,7 @@ struct pci_device simos_driver = {
 	&simos_unit,
 	NULL
 };
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (simos, simos_driver);
-#else
-DATA_SET (pcidevice_set, simos_driver);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char *
 simos_probe(pcici_t tag, pcidi_t type)
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index b1a1dda..26c9bd5 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: xrpu.c,v 1.8 1999/03/12 11:09:18 phk Exp $
+ * $Id: xrpu.c,v 1.9 1999/04/24 20:14:03 peter Exp $
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
@@ -198,11 +198,7 @@ static struct pci_device xrpu_device = {
 	NULL
 };
 
-#ifdef COMPAT_PCI_DRIVER
 COMPAT_PCI_DRIVER (xrpu, xrpu_device);
-#else
-DATA_SET (pcidevice_set, xrpu_device);
-#endif /* COMPAT_PCI_DRIVER */
 
 static const char* 
 xrpu_probe (pcici_t tag, pcidi_t typea)