Automatically modified by

perl -pi -0777 -e 's/\s*?if\s*\(\s*!\s*find_pci_device.*?,\s*\&(\w+)\s*\)\s*\)\s*return\s*0;(.*BOOT_DRIVER\s*\(.*?,)(.*?\))/$2 find_pci_boot_device, $1,$3/sm' *.c

22 files changed, 22 insertions, 88 deletions

diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index d6d152501..b3b29c49f 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -473,9 +473,6 @@ static int t595_probe ( struct dev *dev, struct pci_device *pci ) {
 	int i;
 	unsigned short *p;
 
-	if ( ! find_pci_device ( pci, &t595_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 	eth_nic_base = pci->ioaddr;
@@ -543,7 +540,7 @@ PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
 static struct pci_driver t595_driver =
 	PCI_DRIVER ( "3C595", t595_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "3C595", t595_probe );
+BOOT_DRIVER ( "3C595", find_pci_boot_device, t595_driver, t595_probe );
 
 /*
  * Local variables:
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 52e6c28e8..3993ea64f 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -699,9 +699,6 @@ static int a3c90x_probe ( struct dev *dev, struct pci_device *pci ) {
     unsigned int mstat;
     unsigned short linktype;
 #define	HWADDR_OFFSET	10
-
-    if ( ! find_pci_device ( pci, &a3c90x_driver ) )
-	    return 0;
     
     if (pci->ioaddr == 0)
           return 0;
@@ -994,4 +991,4 @@ PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
 static struct pci_driver a3c90x_driver =
 	PCI_DRIVER ( "3C90X", a3c90x_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "3C90X", a3c90x_probe );
+BOOT_DRIVER ( "3C90X", find_pci_boot_device, a3c90x_driver, a3c90x_probe );
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index cb763de66..8ab697b97 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -661,9 +661,6 @@ static int davicom_probe ( struct dev *dev ) {
 
   whereami("davicom_probe\n");
 
-  if ( ! find_pci_device ( pci, &davicom_driver ) )
-	  return 0;
-
   if (pci->ioaddr == 0)
     return 0;
 
@@ -719,4 +716,4 @@ PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some f
 static struct pci_driver davicom_driver =
 	PCI_DRIVER ( "DAVICOM", davicom_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "DAVICOM", davicom_probe );
+BOOT_DRIVER ( "DAVICOM", find_pci_boot_device, davicom_driver, davicom_probe );
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index 4a79817fd..8067c6af4 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -464,9 +464,6 @@ static int dmfe_probe ( struct dev *dev, struct pci_device *pci ) {
 	uint32_t dev_rev, pci_pmr;
 	int i;
 
-	if ( ! find_pci_device ( pci, &dmfe_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -1229,4 +1226,4 @@ static struct pci_id dmfe_nics[] = {
 static struct pci_driver dmfe_driver =
 	PCI_DRIVER ( "DMFE/PCI", dmfe_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "DMFE/PCI", dmfe_probe );
+BOOT_DRIVER ( "DMFE/PCI", find_pci_boot_device, dmfe_driver, dmfe_probe );
diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 426cf150f..2144fdeb5 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3587,9 +3587,6 @@ static int e1000_probe ( struct dev *dev, struct pci_device *pci ) {
 	unsigned long mmio_start, mmio_len;
 	int ret_val, i;
 
-	if ( ! find_pci_device ( p, &e1000_driver ) )
-		return 0;
-
 	/* Initialize hw with default values */
 	memset(&hw, 0, sizeof(hw));
 	hw.pdev = p;
@@ -3713,4 +3710,4 @@ PCI_ROM(0x8086, 0x107b, "e1000-82546gb-serdes",	     "Intel EtherExpressPro1000
 static struct pci_driver e1000_driver =
 	PCI_DRIVER ( "E1000", e1000_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "E1000", e1000_probe );
+BOOT_DRIVER ( "E1000", find_pci_boot_device, e1000_driver, e1000_probe );
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index c37557bb5..1e1b38c47 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -615,9 +615,6 @@ static int eepro100_probe ( struct dev *dev, struct pci_device *pci ) {
 	   be careful not to access beyond this array */
 	unsigned short eeprom[16];
 
-	if ( ! find_pci_device ( p, &eepro100_driver ) )
-		return 0;
-
 	if (p->ioaddr == 0)
 		return 0;
 	ioaddr = p->ioaddr;
@@ -840,4 +837,4 @@ PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent
 static struct pci_driver eepro100_driver =
 	PCI_DRIVER ( "EEPRO100", eepro100_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "EEPRO100", eepro100_probe );
+BOOT_DRIVER ( "EEPRO100", find_pci_boot_device, eepro100_driver, eepro100_probe );
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index 2cc57c476..32f32b28b 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -105,9 +105,6 @@ epic100_probe ( struct dev *dev, struct pci_device *pci ) {
     unsigned short* ap;
     unsigned int phy, phy_idx;
 
-    if ( ! find_pci_device ( pci, &epic100_driver ) )
-	    return 0;
-
     if (pci->ioaddr == 0)
 	return 0;
 
@@ -521,4 +518,4 @@ PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
 static struct pci_driver epic100_driver =
 	PCI_DRIVER ( "EPIC100", epic100_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "EPIC100", epic100_probe );
+BOOT_DRIVER ( "EPIC100", find_pci_boot_device, epic100_driver, epic100_probe );
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 85f8d796a..31a5d675a 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -947,9 +947,6 @@ static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) {
 	int sz;
 	u8 *base;
 
-	if ( ! find_pci_device ( pci, &forcedeth_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -1038,4 +1035,4 @@ static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) {
 	/* else */
 }
 
-BOOT_DRIVER ( "forcedeth", forcedeth_probe );
+BOOT_DRIVER ( "forcedeth", find_pci_boot_device, forcedeth_driver, forcedeth_probe );
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index 21dbe3e37..45a3eb5a2 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -678,9 +678,6 @@ static int mtd_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
     int i;
 
-    if ( ! find_pci_device ( pci, &mtd80x_driver ) )
-	    return 0;
-
     if (pci->ioaddr == 0)
 	    return 0;
 
@@ -1087,4 +1084,4 @@ static void getlinktype(struct nic *dev)
     }
 }
 
-BOOT_DRIVER ( "MTD80X", mtd_probe );
+BOOT_DRIVER ( "MTD80X", find_pci_boot_device, mtd80x_driver, mtd_probe );
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index c58e9e5c6..a2ddbdc08 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -249,9 +249,6 @@ natsemi_probe ( struct dev *dev, struct pci_device *pci ) {
     int i;
     int prev_eedata;
     u32 tmp;
-    
-    if ( ! find_pci_device ( pci, &natsemi_driver ) )
-	return 0;
 
     if (pci->ioaddr == 0)
         return 0;
@@ -779,4 +776,4 @@ PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
 static struct pci_driver natsemi_driver =
 	PCI_DRIVER ( "NATSEMI", natsemi_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "NATSEMI", natsemi_probe );
+BOOT_DRIVER ( "NATSEMI", find_pci_boot_device, natsemi_driver, natsemi_probe );
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index addf73b6a..2df74ac56 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -831,9 +831,6 @@ static int ns83820_probe ( struct dev *dev, struct pci_device *pci ) {
 	long addr;
 	int using_dac = 0;
 
-	if ( ! find_pci_device ( pci, &ns83820_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -1019,4 +1016,4 @@ static int ns83820_probe ( struct dev *dev, struct pci_device *pci ) {
 	return 1;
 }
 
-BOOT_DRIVER ( "NS83820/PCI", ns83820_probe );
+BOOT_DRIVER ( "NS83820/PCI", find_pci_boot_device, ns83820_driver, ns83820_probe );
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index e7fde8293..f0fa0c7b9 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -676,9 +676,6 @@ static int pcnet32_probe ( struct dev *dev, struct pci_device *pci ) {
 	u8 promaddr[6];
 	int shared = 1;
 
-	if ( ! find_pci_device ( pci, &pcnet32_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -1005,4 +1002,4 @@ static struct pci_id pcnet32_nics[] = {
 static struct pci_driver pcnet32_driver =
 	PCI_DRIVER ( "PCNET32/PCI", pcnet32_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "PCNET32/PCI", pcnet32_probe );
+BOOT_DRIVER ( "PCNET32/PCI", find_pci_boot_device, pcnet32_driver, pcnet32_probe );
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index 52d06337a..4278e83cb 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -31,9 +31,6 @@ static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
   hfa384x_t *hw = &hw_global;
   uint32_t membase = 0; /* Prism2.5 Memory Base */
 
-  if ( ! find_pci_device ( pci, &prism2_pci_driver ) )
-	  return 0;
-
   pci_read_config_dword( pci, PRISM2_PCI_MEM_BASE, &membase);
   membase &= PCI_BASE_ADDRESS_MEM_MASK;
   hw->membase = (uint32_t) phys_to_virt(membase);
@@ -43,5 +40,5 @@ static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
   return prism2_probe ( nic, hw );
 }   
 
-BOOT_DRIVER ( "Prism2_PCI", prism2_pci_probe );
+BOOT_DRIVER ( "Prism2_PCI", find_pci_boot_device, prism2_pci_driver, prism2_pci_probe );
 
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 4355310e0..3a1e539e3 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -96,9 +96,6 @@ static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
   struct nic *nic = nic_device ( dev );
   hfa384x_t *hw = &hw_global;
 
-  if ( ! find_pci_device ( pci, &prism2_plx_driver ) )
-	  return 0;
-
   /* Find and intialise PLX Prism2 card */
   if ( ! prism2_find_plx ( hw, pci ) ) return 0;
   nic->ioaddr = hw->iobase;
@@ -106,5 +103,5 @@ static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
   return prism2_probe ( nic, hw );
 }
 
-BOOT_DRIVER ( "Prism2_PLX", prism2_plx_probe );
+BOOT_DRIVER ( "Prism2_PLX", find_pci_boot_device, prism2_plx_driver, prism2_plx_probe );
 
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index eb42db4cd..2ede19765 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -730,9 +730,6 @@ static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
 	int i, rc;
 	int option = -1, Cap10_100 = 0, Cap1000 = 0;
 
-	if ( ! find_pci_device ( pci, &r8169_driver ) )
-		return 0;
-
 	printf("r8169.c: Found %s, Vendor=%hX Device=%hX\n",
 	       dev->name, pci->vendor, pci->dev_id);
 
@@ -853,4 +850,4 @@ static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
 
 }
 
-BOOT_DRIVER ( "r8169/PCI", r8169_probe );
+BOOT_DRIVER ( "r8169/PCI", find_pci_boot_device, r8169_driver, r8169_probe );
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index ddd7760c6..590225dcd 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -190,9 +190,6 @@ static int rtl8139_probe ( struct dev *dev, struct pci_device *pci ) {
 	int addr_len;
 	unsigned short *ap = (unsigned short*)nic->node_addr;
 
-	if ( ! find_pci_device ( pci, &rtl8139_driver ) )
-		return 0;
-
 	/* Copy ioaddr and IRQ from PCI information */
 	nic->ioaddr = pci->ioaddr;
 	nic->irqno = pci->irq;
@@ -543,4 +540,4 @@ PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
 static struct pci_driver rtl8139_driver =
 	PCI_DRIVER ( "RTL8139", rtl8139_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "RTL8139", rtl8139_probe );
+BOOT_DRIVER ( "RTL8139", find_pci_boot_device, rtl8139_driver, rtl8139_probe );
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index bc2072069..ee7bec55d 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -590,9 +590,6 @@ static int sundance_probe ( struct dev *dev, struct pci_device *pci ) {
 	int i;
 	int speed;
 
-	if ( ! find_pci_device ( pci, &sundance_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -889,4 +886,4 @@ static struct pci_id sundance_nics[] = {
 static struct pci_driver sundance_driver =
 	PCI_DRIVER ( "SUNDANCE/PCI", sundance_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "SUNDANCE/PCI", sundance_probe );
+BOOT_DRIVER ( "SUNDANCE/PCI", find_pci_boot_device, sundance_driver, sundance_probe );
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index 396195511..4ed8ce004 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -3270,9 +3270,6 @@ static int tg3_probe ( struct dev *dev, struct pci_device *pci ) {
 	unsigned long tg3reg_base, tg3reg_len;
 	int i, err, pm_cap;
 
-	if ( ! find_pci_device ( pdev, &tg3_driver ) )
-		return 0;
-
 	memset(tp, 0, sizeof(*tp));
 
 	nic->irqno  = 0;
@@ -3389,4 +3386,4 @@ static int tg3_probe ( struct dev *dev, struct pci_device *pci ) {
 	return 0;
 }
 
-BOOT_DRIVER ( "TG3", tg3_probe );
+BOOT_DRIVER ( "TG3", find_pci_boot_device, tg3_driver, tg3_probe );
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 656daa51a..7c6d5628a 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -787,9 +787,6 @@ static int tlan_probe ( struct dev *dev, struct pci_device *pci ) {
 	int err;
 	int i;
 
-	if ( ! find_pci_device ( pci, &tlan_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
@@ -1717,4 +1714,4 @@ static struct pci_id tlan_nics[] = {
 static struct pci_driver tlan_driver =
 	PCI_DRIVER ( "TLAN/PCI", tlan_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "TLAN/PCI", tlan_probe );
+BOOT_DRIVER ( "TLAN/PCI", find_pci_boot_device, tlan_driver, tlan_probe );
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 656d0f4bf..57f130eba 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -1234,9 +1234,6 @@ static int tulip_probe ( struct dev *dev ) {
     int chip_idx;
     static unsigned char last_phys_addr[ETH_ALEN] = {0x00, 'L', 'i', 'n', 'u', 'x'};
 
-    if ( ! find_pci_device ( pci, &tulip_driver ) )
-	return 0;
-
     if (pci->ioaddr == 0)
         return 0;
 
@@ -2080,4 +2077,4 @@ PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
 static struct pci_driver tulip_driver =
 	PCI_DRIVER ( "Tulip", tulip_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "Tulip", tulip_probe );
+BOOT_DRIVER ( "Tulip", find_pci_boot_device, tulip_driver, tulip_probe );
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 173520e56..7c68e8730 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -958,9 +958,6 @@ rhine_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
 
-    if ( ! find_pci_device ( pci, &rhine_driver ) )
-	    return 0;
-
     if (!pci->ioaddr)
 	return 0;
     rhine_probe1 (nic, pci, pci->ioaddr, pci->dev_id, -1);
@@ -1424,6 +1421,6 @@ PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
 static struct pci_driver rhine_driver =
 	PCI_DRIVER ( "VIA 86C100", rhine_nics, PCI_NO_CLASS );
 
-BOOT_DRIVER ( "VIA 86C100", rhine_probe );
+BOOT_DRIVER ( "VIA 86C100", find_pci_boot_device, rhine_driver, rhine_probe );
 
 /* EOF via-rhine.c */
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 97f09b7d0..0e80890a0 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -626,9 +626,6 @@ w89c840_probe - Look for an adapter, this routine's visible to the outside
 static int w89c840_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
 
-    if ( ! find_pci_device ( p, &w89c840_driver ) )
-	    return 0;
-
     u16 sum = 0;
     int i, j;
     unsigned short value;
@@ -957,4 +954,4 @@ static void init_ring(void)
 }
 
 
-BOOT_DRIVER ( "W89C840F", w89c840_probe );
+BOOT_DRIVER ( "W89C840F", find_pci_boot_device, w89c840_driver, w89c840_probe );