Patch to replace the soon to be defunct pci_find_device with the
new function pci_dev_present. I found 8 .c files (outside of /drivers/net)
that used pci_find_device without the dev it returned. therefore it
was replaceable with the new function.
Hanna Linder
IBM Linux Technology Center
Signed-off-by: Hanna Linder <[email protected]>
diff -Nrup linux-2.6.9-rc2-mm4cln/drivers/char/watchdog/scx200_wdt.c linux-2.6.9-rc2-mm4patch/drivers/char/watchdog/scx200_wdt.c
--- linux-2.6.9-rc2-mm4cln/drivers/char/watchdog/scx200_wdt.c 2004-09-12 22:32:55.000000000 -0700
+++ linux-2.6.9-rc2-mm4patch/drivers/char/watchdog/scx200_wdt.c 2004-09-29 11:07:03.836301112 -0700
@@ -217,6 +217,11 @@ static struct miscdevice scx200_wdt_misc
static int __init scx200_wdt_init(void)
{
int r;
+ static struct pci_device_id ns_sc[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_BRIDGE) },
+ { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE) },
+ { },
+ };
printk(KERN_DEBUG NAME ": NatSemi SCx200 Watchdog Driver\n");
@@ -224,12 +229,7 @@ static int __init scx200_wdt_init(void)
* First check that this really is a NatSemi SCx200 CPU or a Geode
* SC1100 processor
*/
- if ((pci_find_device(PCI_VENDOR_ID_NS,
- PCI_DEVICE_ID_NS_SCx200_BRIDGE,
- NULL)) == NULL
- && (pci_find_device(PCI_VENDOR_ID_NS,
- PCI_DEVICE_ID_NS_SC1100_BRIDGE,
- NULL)) == NULL)
+ if (!pci_dev_present(ns_sc))
return -ENODEV;
/* More sanity checks, verify that the configuration block is there */