Following patch replaces pci_find_device with pci_get_device to avoid
following compiliation warning;
drivers/isdn/hisax/telespci.c: In function `setup_telespci':
drivers/isdn/hisax/telespci.c:303: warning: `pci_find_device' is deprecated
(declared at include/linux/pci.h:478)
Signed-off-by: S.Çağlar Onur <[EMAIL PROTECTED]>
---
drivers/isdn/hisax/telespci.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
Index: linux-2.6/drivers/isdn/hisax/telespci.c
===================================================================
--- linux-2.6.orig/drivers/isdn/hisax/telespci.c
+++ linux-2.6/drivers/isdn/hisax/telespci.c
@@ -300,13 +300,13 @@ setup_telespci(struct IsdnCard *card)
if (cs->typ != ISDN_CTYPE_TELESPCI)
return (0);
#ifdef CONFIG_PCI
- if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN,
PCI_DEVICE_ID_ZORAN_36120, dev_tel))) {
+ if ((dev_tel = pci_get_device (PCI_VENDOR_ID_ZORAN,
PCI_DEVICE_ID_ZORAN_36120, dev_tel))) {
if (pci_enable_device(dev_tel))
- return(0);
+ goto dev_tel_cleanup;
cs->irq = dev_tel->irq;
if (!cs->irq) {
printk(KERN_WARNING "Teles: No IRQ for PCI card
found\n");
- return(0);
+ goto dev_tel_cleanup;
}
cs->hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0),
PAGE_SIZE);
@@ -353,7 +353,13 @@ setup_telespci(struct IsdnCard *card)
printk(KERN_WARNING
"TelesPCI: wrong HSCX versions check IO/MEM addresses\n");
release_io_telespci(cs);
- return (0);
+ goto dev_tel_cleanup;
}
+ pci_dev_put(dev_tel);
return (1);
+
+dev_tel_cleanup:
+ pci_dev_put(dev_tel);
+ return (0);
+
}
--
S.Çağlar Onur <[EMAIL PROTECTED]>
http://cekirdek.pardus.org.tr/~caglar/
Linux is like living in a teepee. No Windows, no Gates and an Apache in house!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
