[PATCH 1/12] drivers/isdn/hisax/avm_pci.c: replace pci_find_device with pci_get_device

[S.Çağlar Onur]

Following patch replaces pci_find_device with pci_get_device to avoid 
following compiliation warning;

drivers/isdn/hisax/avm_pci.c: In function `setup_avm_pcipnp':
drivers/isdn/hisax/avm_pci.c:792: 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/avm_pci.c |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: linux-2.6/drivers/isdn/hisax/avm_pci.c
===================================================================
--- linux-2.6.orig/drivers/isdn/hisax/avm_pci.c
+++ linux-2.6/drivers/isdn/hisax/avm_pci.c
@@ -789,19 +789,19 @@ setup_avm_pcipnp(struct IsdnCard *card)
        }
 #endif
 #ifdef CONFIG_PCI
-       if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
+       if ((dev_avm = pci_get_device(PCI_VENDOR_ID_AVM,
                PCI_DEVICE_ID_AVM_A1,  dev_avm))) {
                if (pci_enable_device(dev_avm))
-                       return(0);
+                       goto dev_avm_cleanup;
                cs->irq = dev_avm->irq;
                if (!cs->irq) {
                        printk(KERN_ERR "FritzPCI: No IRQ for PCI card 
found\n");
-                       return(0);
+                       goto dev_avm_cleanup;
                }
                cs->hw.avm.cfg_reg = pci_resource_start(dev_avm, 1);
                if (!cs->hw.avm.cfg_reg) {
                        printk(KERN_ERR "FritzPCI: No IO-Adr for PCI card 
found\n");
-                       return(0);
+                       goto dev_avm_cleanup;
                }
                cs->subtyp = AVM_FRITZ_PCI;
        } else {
@@ -822,7 +822,7 @@ ready:
                       CardType[card->typ],
                       cs->hw.avm.cfg_reg,
                       cs->hw.avm.cfg_reg + 31);
-               return (0);
+               goto dev_avm_cleanup;
        }
        switch (cs->subtyp) {
          case AVM_FRITZ_PCI:
@@ -842,7 +842,7 @@ ready:
                break;
          default:
                printk(KERN_WARNING "AVM unknown subtype %d\n", cs->subtyp);
-               return(0);
+               goto dev_avm_cleanup;
        }
        printk(KERN_INFO "HiSax: %s config irq:%d base:0x%X\n",
                (cs->subtyp == AVM_FRITZ_PCI) ? "AVM Fritz!PCI" : "AVM 
Fritz!PnP",
@@ -858,5 +858,10 @@ ready:
        cs->irq_func = &avm_pcipnp_interrupt;
        cs->writeisac(cs, ISAC_MASK, 0xFF);
        ISACVersion(cs, (cs->subtyp == AVM_FRITZ_PCI) ? "AVM PCI:" : "AVM 
PnP:");
+       pci_dev_put(dev_avm);
        return (1);
+
+dev_avm_cleanup:
+       pci_dev_put(dev_avm);
+       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/