drivers/isdn/hisax/hfc_pci.c: replace pci_find_device with pci_get_device
PATCH 7/12 drivers/isdn/hisax/hfc_pci.c: replace pci_find_device with pci_get_device
Following patch replaces pci_find_device with pci_get_device to avoid following compiliation warning;
drivers/isdn/hisax/hfc_pci.c: In function `setup_hfcpci':drivers/isdn/hisax/hfc_pci.c:1668: warning: `pci_find_device' is deprecated (declared at include/linux/pci.h:478)
--- drivers/isdn/hisax/hfc_pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/isdn/hisax/hfc_pci.c +2 -2
@@ -1665,7 +1665,7 @@ setup_hfcpci(struct IsdnCard *card)if (cs->typ ==ISDN_CTYPE_HFC_PCI ) { i =0 ;while (id_list[i].vendor_id) { - tmp_hfcpci =pci_find_device (id_list[i].vendor_id, + tmp_hfcpci =pci_get_device (id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++;
@@ -1687,7 +1687,7 @@ setup_hfcpci(struct IsdnCard *card) cs->irq = dev_hfcpci->irq;if (!cs->irq) {printk (KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n" ); -return (0 ); + goto tmp_hfcpci_cleanup; } cs->hw.hfcpci.pci_io = (char *)(unsigned
long)dev_hfcpci->resource[1].start;
printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n",
id_list[i].vendor_name, id_list[i].card_name);
@@ -1697,14 +1697,14 @@ setup_hfcpci(struct IsdnCard *card)
}
if (!cs->hw.hfcpci.pci_io) {
printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
- return (0);
+ goto tmp_hfcpci_cleanup;
}
/* Allocate memory for FIFOS */
/* Because the HFC-PCI needs a 32K physical alignment, we */
/* need to allocate the double mem and align the address */
if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) {
printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n");
- return 0;
+ goto tmp_hfcpci_cleanup;
}
cs->hw.hfcpci.fifos = (void *)
(((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000;
@@ -1741,9 +1741,14 @@ setup_hfcpci(struct IsdnCard *card)
cs->cardmsg = &hfcpci_card_msg;
cs->auxcmd = &hfcpci_auxcmd;
spin_unlock_irqrestore(&cs->lock, flags);
+ pci_dev_put(tmp_hfcpci);
return (1);
} else
return (0); /* no valid card type */
+
+tmp_hfcpci_cleanup:
+ pci_put_dev(tmp_hfcpci);
+ return (0);
#else
printk(KERN_WARNING "HFC-PCI: NO_PCI_BIOS\n");
return (0);
Signature · 4 lines
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!
[resend] i forget to quilt refresh :(, sorry for noise
14 Tem 2007 Cts tarihinde, S.Çağlar Onur şunları yazmıştı:
Quoted 3 lines
--- drivers/isdn/hisax/hfc_pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Following patch replaces pci_find_device with pci_get_device to avoid following compiliation warning;
drivers/isdn/hisax/hfc_pci.c: In function `setup_hfcpci':drivers/isdn/hisax/hfc_pci.c:1668: warning: `pci_find_device' is deprecated (declared at include/linux/pci.h:478)
--- drivers/isdn/hisax/hfc_pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/isdn/hisax/hfc_pci.c +2 -2
@@ -1665,7 +1665,7 @@ setup_hfcpci(struct IsdnCard *card)if (cs->typ ==ISDN_CTYPE_HFC_PCI ) { i =0 ;while (id_list[i].vendor_id) { - tmp_hfcpci =pci_find_device (id_list[i].vendor_id, + tmp_hfcpci =pci_get_device (id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++;
@@ -1687,7 +1687,7 @@ setup_hfcpci(struct IsdnCard *card) cs->irq = dev_hfcpci->irq;if (!cs->irq) {printk (KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n" ); -return (0 ); + goto tmp_hfcpci_cleanup; } cs->hw.hfcpci.pci_io = (char *)(unsigned
long)dev_hfcpci->resource[1].start;
printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n",
id_list[i].vendor_name, id_list[i].card_name);
@@ -1697,14 +1697,14 @@ setup_hfcpci(struct IsdnCard *card)
}
if (!cs->hw.hfcpci.pci_io) {
printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
- return (0);
+ goto tmp_hfcpci_cleanup;
}
/* Allocate memory for FIFOS */
/* Because the HFC-PCI needs a 32K physical alignment, we */
/* need to allocate the double mem and align the address */
if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) {
printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n");
- return 0;
+ goto tmp_hfcpci_cleanup;
}
cs->hw.hfcpci.fifos = (void *)
(((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000;
@@ -1741,9 +1741,14 @@ setup_hfcpci(struct IsdnCard *card)
cs->cardmsg = &hfcpci_card_msg;
cs->auxcmd = &hfcpci_auxcmd;
spin_unlock_irqrestore(&cs->lock, flags);
+ pci_dev_put(tmp_hfcpci);
return (1);
} else
return (0); /* no valid card type */
+
+tmp_hfcpci_cleanup:
+ pci_dev_put(tmp_hfcpci);
+ return (0);
#else
printk(KERN_WARNING "HFC-PCI: NO_PCI_BIOS\n");
return (0);
Signature · 4 lines
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!