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

src/drivers/net/3c595.c

 	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;
 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:

src/drivers/net/3c90x.c

     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;
 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 );

src/drivers/net/davicom.c

 
   whereami("davicom_probe\n");
 
-  if ( ! find_pci_device ( pci, &davicom_driver ) )
-	  return 0;
-
   if (pci->ioaddr == 0)
     return 0;
 
 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 );

src/drivers/net/dmfe.c

 	uint32_t dev_rev, pci_pmr;
 	int i;
 
-	if ( ! find_pci_device ( pci, &dmfe_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 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 );

src/drivers/net/e1000.c

 	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;
 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 );

src/drivers/net/eepro100.c

 	   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;
 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 );

src/drivers/net/epic100.c

     unsigned short* ap;
     unsigned int phy, phy_idx;
 
-    if ( ! find_pci_device ( pci, &epic100_driver ) )
-	    return 0;
-
     if (pci->ioaddr == 0)
 	return 0;
 
 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 );

src/drivers/net/forcedeth.c

 	int sz;
 	u8 *base;
 
-	if ( ! find_pci_device ( pci, &forcedeth_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 	/* else */
 }
 
-BOOT_DRIVER ( "forcedeth", forcedeth_probe );
+BOOT_DRIVER ( "forcedeth", find_pci_boot_device, forcedeth_driver, forcedeth_probe );

src/drivers/net/mtd80x.c

     struct nic *nic = nic_device ( dev );
     int i;
 
-    if ( ! find_pci_device ( pci, &mtd80x_driver ) )
-	    return 0;
-
     if (pci->ioaddr == 0)
 	    return 0;
 
     }
 }
 
-BOOT_DRIVER ( "MTD80X", mtd_probe );
+BOOT_DRIVER ( "MTD80X", find_pci_boot_device, mtd80x_driver, mtd_probe );

src/drivers/net/natsemi.c

     int i;
     int prev_eedata;
     u32 tmp;
-    
-    if ( ! find_pci_device ( pci, &natsemi_driver ) )
-	return 0;
 
     if (pci->ioaddr == 0)
         return 0;
 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 );

src/drivers/net/ns83820.c

 	long addr;
 	int using_dac = 0;
 
-	if ( ! find_pci_device ( pci, &ns83820_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 	return 1;
 }
 
-BOOT_DRIVER ( "NS83820/PCI", ns83820_probe );
+BOOT_DRIVER ( "NS83820/PCI", find_pci_boot_device, ns83820_driver, ns83820_probe );

src/drivers/net/pcnet32.c

 	u8 promaddr[6];
 	int shared = 1;
 
-	if ( ! find_pci_device ( pci, &pcnet32_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 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 );

src/drivers/net/prism2_pci.c

   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);
   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 );
 

src/drivers/net/prism2_plx.c

   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;
   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 );
 

src/drivers/net/r8169.c

 	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);
 
 
 }
 
-BOOT_DRIVER ( "r8169/PCI", r8169_probe );
+BOOT_DRIVER ( "r8169/PCI", find_pci_boot_device, r8169_driver, r8169_probe );

src/drivers/net/rtl8139.c

 	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;
 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 );

src/drivers/net/sundance.c

 	int i;
 	int speed;
 
-	if ( ! find_pci_device ( pci, &sundance_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 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 );

src/drivers/net/tg3.c

 	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;
 	return 0;
 }
 
-BOOT_DRIVER ( "TG3", tg3_probe );
+BOOT_DRIVER ( "TG3", find_pci_boot_device, tg3_driver, tg3_probe );

src/drivers/net/tlan.c

 	int err;
 	int i;
 
-	if ( ! find_pci_device ( pci, &tlan_driver ) )
-		return 0;
-
 	if (pci->ioaddr == 0)
 		return 0;
 
 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 );

src/drivers/net/tulip.c

     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;
 
 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 );

src/drivers/net/via-rhine.c

     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);
 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 */

src/drivers/net/w89c840.c

 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;
 }
 
 
-BOOT_DRIVER ( "W89C840F", w89c840_probe );
+BOOT_DRIVER ( "W89C840F", find_pci_boot_device, w89c840_driver, w89c840_probe );