Re: [PATCH 3/3] pci: gt96100eth avoid pci_find_device

gt96100eth avoid pci_find_device

Change pci_find_device to safer pci_get_device with support for more
bridges.

Signed-off-by: Jiri Slaby <redacted>

---
commit fd863b81ac491faf783ff7f2dcf6032177c5ab7f
tree d7eb59f897505230023754f19ad7227eec39e676
parent 4b73c16f5411d97360d5f26f292ffddeb670ff75
author Jiri Slaby [off-list ref] Mon, 05 Jun 2006 22:01:20 +0159
committer Jiri Slaby [off-list ref] Mon, 05 Jun 2006 22:01:20 +0159

 drivers/net/gt96100eth.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 2d24354..3066c86 100644
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c

@@ -600,6 +600,11 @@ disable_ether_irq(struct net_device *dev
 	GT96100ETH_WRITE(gp, GT96100_ETH_INT_MASK, 0);
 }
 
+static struct pci_device_id gt96100_ids[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT96100) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT96100A) },
+	{ 0 }
+};
 
 /*
  * Init GT96100 ethernet controller driver

@@ -607,16 +612,20 @@ disable_ether_irq(struct net_device *dev
 static int gt96100_init_module(void)
 {
 	struct pci_dev *pci;
+	struct pci_device_id *id;
 	int i, retval=0;
 	u32 cpuConfig;
 
 	/*
 	 * Stupid probe because this really isn't a PCI device
 	 */
-	if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
-	                            PCI_DEVICE_ID_MARVELL_GT96100, NULL)) &&
-	    !(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
-		                    PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
+	for (id = gt96100_ids; id->vendor; id++) {
+		pci = pci_get_device(id->vendor, id->device, NULL);
+		if (pci != NULL)
+			break;
+	}

+
+	if (!id->vendor) {
 		printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
 		return -ENODEV;
 	}

@@ -625,12 +634,16 @@ static int gt96100_init_module(void)
 	if (cpuConfig & (1<<12)) {
 		printk(KERN_ERR __FILE__
 		       ": must be in Big Endian mode!\n");
-		return -ENODEV;
+		retval = -ENODEV;
+		goto err_pput;
 	}
 
 	for (i=0; i < NUM_INTERFACES; i++)
 		retval |= gt96100_probe1(pci, i);
 
+err_pput:
+	pci_dev_put(pci);
+
 	return retval;
 }