[PATCH] driver/isdn/hisax/telespci.c: Fix compile time warning.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello, this patch removes the following warning. Also removes the use of
 function 'pci_find_device'.

CC      drivers/isdn/hisax/telespci.o
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:537)

If anything else please notice. Thanks.

Signed-off-by: Rakib Mullick(rakib.mullick@xxxxxxxxx)

--- linux-2.6.27-rc8.orig/drivers/isdn/hisax/telespci.c	2008-10-01
19:17:34.000000000 +0600
+++ linux-2.6.27-rc8/drivers/isdn/hisax/telespci.c	2008-10-04
10:03:24.000000000 +0600
@@ -300,12 +300,17 @@ setup_telespci(struct IsdnCard *card)
 	if (cs->typ != ISDN_CTYPE_TELESPCI)
 		return (0);

-	if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN,
PCI_DEVICE_ID_ZORAN_36120, dev_tel))) {
-		if (pci_enable_device(dev_tel))
+	dev_tel = pci_get_device(PCI_VENDOR_ID_ZORAN,
+			 PCI_DEVICE_ID_ZORAN_36120, dev_tel);
+	if (dev_tel) {
+		if (pci_enable_device(dev_tel)) {
+			pci_dev_put(dev_tel);
 			return(0);
+		}
 		cs->irq = dev_tel->irq;
 		if (!cs->irq) {
 			printk(KERN_WARNING "Teles: No IRQ for PCI card found\n");
+			pci_dev_put(dev_tel);
 			return(0);
 		}
 		cs->hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0),
@@ -314,6 +319,7 @@ setup_telespci(struct IsdnCard *card)
 			(unsigned long long)pci_resource_start(dev_tel, 0),
 			dev_tel->irq);
 	} else {
+		pci_dev_put(dev_tel);
 		printk(KERN_WARNING "TelesPCI: No PCI card found\n");
 		return(0);
 	}
@@ -348,6 +354,7 @@ setup_telespci(struct IsdnCard *card)
 		printk(KERN_WARNING
 		 "TelesPCI: wrong HSCX versions check IO/MEM addresses\n");
 		release_io_telespci(cs);
+		pci_dev_put(dev_tel);
 		return (0);
 	}
 	return (1);
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux