Re: [PATCH 3/3] pci: gt96100eth avoid pci_find_device
From: Jeff Garzik <hidden>
Date: 2006-05-26 00:38:04
Also in:
lkml
Jiri Slaby wrote:
quoted hunk
gt96100eth avoid pci_find_device Change pci_find_device to safer pci_get_device. Signed-off-by: Jiri Slaby <redacted> --- commit f656671e9da9d33bd7a2fb3f5c0d0f7009925698 tree b92c808b6a9eecce58b0f7b0ffe1237631dbd65a parent 1d3b6caf027fe53351c645523587aeac40bc3e47 author Jiri Slaby [off-list ref] Fri, 26 May 2006 01:55:23 +0159 committer Jiri Slaby [off-list ref] Fri, 26 May 2006 01:55:23 +0159 drivers/net/gt96100eth.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c index 2d24354..beac56d 100644 --- a/drivers/net/gt96100eth.c +++ b/drivers/net/gt96100eth.c@@ -613,9 +613,9 @@ static int gt96100_init_module(void) /* * Stupid probe because this really isn't a PCI device */ - if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, + if (!(pci = pci_get_device(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT96100, NULL)) && - !(pci = pci_find_device(PCI_VENDOR_ID_MARVELL, + !(pci = pci_get_device(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) { printk(KERN_ERR __FILE__ ": GT96100 not found!\n"); return -ENODEV;
Seems OK to me, though you may wish to use a pci_device_id list with pci_match_[one_]device() here too. Jeff