From 82760a894307ed8bc98513d6a098e4bda48820b4 Mon Sep 17 00:00:00 2001 From: "Hanna V. Linder" <hannal@us.ibm.com> Date: Wed, 10 Nov 2004 00:45:21 -0800 Subject: [PATCH] [PATCH] scx200_wdt.c: replace pci_find_device with pci_dev_present 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. Signed-off-by: Hanna Linder <hannal@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> --- drivers/char/watchdog/scx200_wdt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c index 983e9e980d3f..0c47a43068e6 100644 --- a/drivers/char/watchdog/scx200_wdt.c +++ b/drivers/char/watchdog/scx200_wdt.c @@ -217,6 +217,11 @@ static struct miscdevice scx200_wdt_miscdev = { 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 */ -- 2.30.9