Automatically updated using

perl -pi -0777 -e 's/(_probe\s*\(\s*struct\s+dev.*?)(\s*\)\s*{.*?$)\s*struct pci_device.*?=\s*pci_device \( dev \);$/${1}, struct pci_device *pci${2}/ms' *.c

sis900 excluded from update

23 files changed, 23 insertions, 48 deletions

diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index 96c623fff..d6d152501 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -468,9 +468,8 @@ static void t595_irq(struct nic *nic __unused, irq_action_t action __unused)
 /**************************************************************************
 ETH_PROBE - Look for an adapter
 ***************************************************************************/
-static int t595_probe ( struct dev *dev ) {
+static int t595_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	int i;
 	unsigned short *p;
 
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 7805bb03b..52e6c28e8 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -690,9 +690,8 @@ static void a3c90x_irq(struct nic *nic __unused, irq_action_t action __unused)
  *** initialization.  If this routine is called, the pci functions did find the
  *** card.  We just have to init it here.
  ***/
-static int a3c90x_probe ( struct dev *dev ) {
+static int a3c90x_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *pci = pci_device ( dev );
     int i, c;
     unsigned short eeprom[0x21];
     unsigned int cfg;
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 44e2bf212..cb763de66 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -178,7 +178,7 @@ static void davicom_media_chk(struct nic *);
 /*********************************************************************/
 /* Utility Routines                                                  */
 /*********************************************************************/
-static inline void whereami(const char *str)
+static inline void whereami(const char *str, struct pci_device *pci)
 {
   printf("%s\n", str);
   /* sleep(2); */
@@ -657,7 +657,6 @@ static void davicom_irq(struct nic *nic __unused, irq_action_t action __unused)
 /*********************************************************************/
 static int davicom_probe ( struct dev *dev ) {
   struct nic *nic = nic_device ( dev );
-  struct pci_device *pci = pci_device ( dev );
   unsigned int i;
 
   whereami("davicom_probe\n");
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index 0aacec5fa..4a79817fd 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -459,9 +459,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int dmfe_probe ( struct dev *dev ) {
+static int dmfe_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	uint32_t dev_rev, pci_pmr;
 	int i;
 
diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 3cd91f73f..426cf150f 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3582,9 +3582,8 @@ static void e1000_irq(struct nic *nic __unused, irq_action_t action)
 PROBE - Look for an adapter, this routine's visible to the outside
 You should omit the last argument struct pci_device * for a non-PCI NIC
 ***************************************************************************/
-static int e1000_probe ( struct dev *dev ) {
+static int e1000_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *p = pci_device ( dev );
 	unsigned long mmio_start, mmio_len;
 	int ret_val, i;
 
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index bccb91902..c37557bb5 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -603,9 +603,8 @@ static void eepro100_disable ( struct nic *nic __unused ) {
  *            leaves the 82557 initialized, and ready to recieve packets.
  */
 
-static int eepro100_probe ( struct dev *dev ) {
+static int eepro100_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *p = pci_device ( dev );
 	unsigned short sum = 0;
 	int i;
 	int read_cmd, ee_size;
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index efe93c987..2cc57c476 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -99,9 +99,8 @@ static unsigned char		tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
 
 
 static int
-epic100_probe ( struct dev *dev ) {
+epic100_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *pci = pci_device ( dev );
     int i;
     unsigned short* ap;
     unsigned int phy, phy_idx;
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 966d25ef7..85f8d796a 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -941,9 +941,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 #define IORESOURCE_MEM 0x00000200
 #define board_found 1
 #define valid_link 0
-static int forcedeth_probe ( struct dev *dev ) {
+static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	unsigned long addr;
 	int sz;
 	u8 *base;
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index db6e82735..21dbe3e37 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -674,9 +674,8 @@ static struct pci_driver mtd80x_driver =
 PROBE - Look for an adapter, this routine's visible to the outside
 ***************************************************************************/
 
-static int mtd_probe ( struct dev *dev ) {
+static int mtd_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *pci = pci_device ( dev );
     int i;
 
     if ( ! find_pci_device ( pci, &mtd80x_driver ) )
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index e66289d00..c58e9e5c6 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -243,11 +243,9 @@ static void natsemi_irq(struct nic *nic, irq_action_t action);
  */
 
 static int
-natsemi_probe ( struct dev *dev ) {
+natsemi_probe ( struct dev *dev, struct pci_device *pci ) {
 
     struct nic *nic = nic_device ( dev );
-
-    struct pci_device *pci = pci_device ( dev );
     int i;
     int prev_eedata;
     u32 tmp;
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index 5ce219170..addf73b6a 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -825,9 +825,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int ns83820_probe ( struct dev *dev ) {
+static int ns83820_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	int sz;
 	long addr;
 	int using_dac = 0;
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 900e0db84..e7fde8293 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -666,9 +666,8 @@ static void pcnet32_irq(struct nic *nic __unused, irq_action_t action __unused)
 PROBE - Look for an adapter, this routine's visible to the outside
 You should omit the last argument struct pci_device * for a non-PCI NIC
 ***************************************************************************/
-static int pcnet32_probe ( struct dev *dev ) {
+static int pcnet32_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	int i, media;
 	int fdx, mii, fset, dxsuflo, ltint;
 	int chip_version;
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index 08a698c8b..52d06337a 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -26,9 +26,8 @@ PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
 static struct pci_driver prism2_pci_driver =
 	PCI_DRIVER ( "Prism2_PCI", prism2_pci_nics, PCI_NO_CLASS );
 
-static int prism2_pci_probe ( struct dev *dev ) {
+static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
   struct nic *nic = nic_device ( dev );
-  struct pci_device *pci = pci_device ( dev );
   hfa384x_t *hw = &hw_global;
   uint32_t membase = 0; /* Prism2.5 Memory Base */
 
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 03a6db2fa..4355310e0 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -92,9 +92,8 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
   return found;
 }
 
-static int prism2_plx_probe ( struct dev *dev ) {
+static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
   struct nic *nic = nic_device ( dev );
-  struct pci_device *pci = pci_device ( dev );
   hfa384x_t *hw = &hw_global;
 
   if ( ! find_pci_device ( pci, &prism2_plx_driver ) )
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 2cb97a258..eb42db4cd 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -723,9 +723,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int r8169_probe ( struct dev *dev ) {
+static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	static int board_idx = -1;
 	static int printed_version = 0;
 	int i, rc;
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 3c1cc739c..c61f0374c 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -183,9 +183,8 @@ static void rtl_irq(struct nic *nic, irq_action_t action);
 static struct nic_operations rtl_operations;
 static struct pci_driver rtl8139_driver;
 
-static int rtl8139_probe ( struct dev *dev ) {
+static int rtl8139_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	int i;
 	int speed10, fullduplex;
 	int addr_len;
diff --git a/src/drivers/net/skel.c b/src/drivers/net/skel.c
index 45627883b..41d68f68a 100644
--- a/src/drivers/net/skel.c
+++ b/src/drivers/net/skel.c
@@ -133,12 +133,10 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int skel_probe ( struct dev *dev ) {
+static int skel_probe ( struct dev *dev, struct pci_device *pci ) {
 
 	struct nic *nic = nic_device ( dev );
 
-	struct pci_device *pci = pci_device ( dev );
-
 	if (board_found && valid_link)
 	{
 		/* store NIC parameters */
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 45271f51a..bc2072069 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -583,9 +583,8 @@ static struct pci_driver sundance_driver;
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
 ***************************************************************************/
-static int sundance_probe ( struct dev *dev ) {
+static int sundance_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	u8 ee_data[EEPROM_SIZE];
 	u16 mii_ctl;
 	int i;
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index 716bc3e55..396195511 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -3264,9 +3264,8 @@ static struct pci_driver tg3_driver =
 PROBE - Look for an adapter, this routine's visible to the outside
 You should omit the last argument struct pci_device * for a non-PCI NIC
 ***************************************************************************/
-static int tg3_probe ( struct dev *dev ) {
+static int tg3_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pdev = pci_device ( dev );
 	struct tg3 *tp = &tg3;
 	unsigned long tg3reg_base, tg3reg_len;
 	int i, err, pm_cap;
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index cdaf5fea8..656daa51a 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -781,9 +781,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
 
 #define board_found 1
 #define valid_link 0
-static int tlan_probe ( struct dev *dev ) {
+static int tlan_probe ( struct dev *dev, struct pci_device *pci ) {
 	struct nic *nic = nic_device ( dev );
-	struct pci_device *pci = pci_device ( dev );
 	u16 data = 0;
 	int err;
 	int i;
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 5bb1f4a67..656d0f4bf 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -516,7 +516,7 @@ static void tulip_more(void);
 /*********************************************************************/
 
 #ifdef TULIP_DEBUG_WHERE
-static void whereami (const char *str)
+static void whereami (const char *str, struct pci_device *pci)
 {
     printf("%s: %s\n", tp->nic_name, str);
     /* sleep(2); */
@@ -1227,7 +1227,6 @@ static struct pci_driver tulip_driver;
 /*********************************************************************/
 static int tulip_probe ( struct dev *dev ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *pci = pci_device ( dev );
     u32 i;
     u8  chip_rev;
     u8 ee_data[EEPROM_SIZE];
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 7a2f4ba31..173520e56 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -954,9 +954,8 @@ static struct nic_operations rhine_operations;
 static struct pci_driver rhine_driver;
 
 static int
-rhine_probe ( struct dev *dev ) {
+rhine_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *pci = pci_device ( dev );
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
 
     if ( ! find_pci_device ( pci, &rhine_driver ) )
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index fdc7f0315..97f09b7d0 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -623,9 +623,8 @@ static struct pci_driver w89c840_driver =
 /**************************************************************************
 w89c840_probe - Look for an adapter, this routine's visible to the outside
 ***************************************************************************/
-static int w89c840_probe ( struct dev *dev ) {
+static int w89c840_probe ( struct dev *dev, struct pci_device *pci ) {
     struct nic *nic = nic_device ( dev );
-    struct pci_device *p = pci_device ( dev );
 
     if ( ! find_pci_device ( p, &w89c840_driver ) )
 	    return 0;