drivers/isdn/hisax/niccy.c: replace pci_find_device with pci_get_device
PATCH 5/12 drivers/isdn/hisax/niccy.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/niccy.c: In function `setup_niccy':drivers/isdn/hisax/niccy.c:305: 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/niccy.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/isdn/hisax/niccy.c +13 -8
@@ -302,29 +302,29 @@ int __devinit setup_niccy(struct IsdnCar#ifdef CONFIG_PCI u_int pci_ioaddr; cs->subtyp =0 ; -if ((niccy_dev =pci_find_device (PCI_VENDOR_ID_SATSAGEM , +if ((niccy_dev =pci_get_device (PCI_VENDOR_ID_SATSAGEM ,PCI_DEVICE_ID_SATSAGEM_NICCY , niccy_dev))) {if (pci_enable_device (niccy_dev)) -return 0 ; + goto niccy_dev_cleanup;/* get IRQ */ if (!niccy_dev->irq) {printk (KERN_WARNING "Niccy: No IRQ for PCI card found\n" ); -return 0 ; + goto niccy_dev_cleanup; } cs->irq = niccy_dev->irq; cs->hw.niccy.cfg_reg =pci_resource_start (niccy_dev,0 );if (!cs->hw.niccy.cfg_reg) {printk (KERN_WARNING "Niccy: No IO-Adr for PCI cfg found\n" ); -return 0 ; + goto niccy_dev_cleanup; } pci_ioaddr =pci_resource_start (niccy_dev,1 );if (!pci_ioaddr) {printk (KERN_WARNING "Niccy: No IO-Adr for PCI card found\n" ); -return 0 ; + goto niccy_dev_cleanup; } cs->subtyp =NICCY_PCI ; }else {
@@ -341,7 +341,7 @@ int __devinit setup_niccy(struct IsdnCar"HiSax: %s data port %x-%x already in use\n" , CardType[card->typ], cs->hw.niccy.isac, cs->hw.niccy.isac + 4); -return 0 ; + goto niccy_dev_cleanup; }if (!request_region (cs->hw.niccy.cfg_reg,0x40 ,"niccy pci" )) { printk(KERN_WARNING
@@ -350,7 +350,7 @@ int __devinit setup_niccy(struct IsdnCar cs->hw.niccy.cfg_reg, cs->hw.niccy.cfg_reg + 0x40);release_region (cs->hw.niccy.isac,4 ); - return 0; + goto niccy_dev_cleanup; }#else printk (KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n" );
@@ -376,7 +376,12 @@ int __devinit setup_niccy(struct IsdnCarprintk (KERN_WARNING "Niccy: wrong HSCX versions check IO " "address\n" );release_io_niccy (cs); -return 0 ; + goto niccy_dev_cleanup; } +pci_dev_put (niccy_dev);return 1 ; + +niccy_dev_cleanup: +pci_dev_put (niccy_dev); +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/niccy.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
Following patch replaces pci_find_device with pci_get_device to avoid following compiliation warning;
drivers/isdn/hisax/niccy.c: In function `setup_niccy':drivers/isdn/hisax/niccy.c:305: 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/niccy.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/isdn/hisax/niccy.c +13 -8
@@ -302,29 +302,29 @@ int __devinit setup_niccy(struct IsdnCar#ifdef CONFIG_PCI u_int pci_ioaddr; cs->subtyp =0 ; -if ((niccy_dev =pci_find_device (PCI_VENDOR_ID_SATSAGEM , +if ((niccy_dev =pci_get_device (PCI_VENDOR_ID_SATSAGEM ,PCI_DEVICE_ID_SATSAGEM_NICCY , niccy_dev))) {if (pci_enable_device (niccy_dev)) -return 0 ; + goto niccy_dev_cleanup;/* get IRQ */ if (!niccy_dev->irq) {printk (KERN_WARNING "Niccy: No IRQ for PCI card found\n" ); -return 0 ; + goto niccy_dev_cleanup; } cs->irq = niccy_dev->irq; cs->hw.niccy.cfg_reg =pci_resource_start (niccy_dev,0 );if (!cs->hw.niccy.cfg_reg) {printk (KERN_WARNING "Niccy: No IO-Adr for PCI cfg found\n" ); -return 0 ; + goto niccy_dev_cleanup; } pci_ioaddr =pci_resource_start (niccy_dev,1 );if (!pci_ioaddr) {printk (KERN_WARNING "Niccy: No IO-Adr for PCI card found\n" ); -return 0 ; + goto niccy_dev_cleanup; } cs->subtyp =NICCY_PCI ; }else {
@@ -341,7 +341,7 @@ int __devinit setup_niccy(struct IsdnCar"HiSax: %s data port %x-%x already in use\n" , CardType[card->typ], cs->hw.niccy.isac, cs->hw.niccy.isac + 4); -return 0 ; + goto niccy_dev_cleanup; }if (!request_region (cs->hw.niccy.cfg_reg,0x40 ,"niccy pci" )) { printk(KERN_WARNING
@@ -350,7 +350,7 @@ int __devinit setup_niccy(struct IsdnCar cs->hw.niccy.cfg_reg, cs->hw.niccy.cfg_reg + 0x40);release_region (cs->hw.niccy.isac,4 ); - return 0; + goto niccy_dev_cleanup; }#else printk (KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n" );
@@ -376,7 +376,12 @@ int __devinit setup_niccy(struct IsdnCarprintk (KERN_WARNING "Niccy: wrong HSCX versions check IO " "address\n" );release_io_niccy (cs); -return 0 ; + goto niccy_dev_cleanup; } +pci_dev_put (niccy_dev);return 1 ; + +niccy_dev_cleanup: +pci_dev_put (niccy_dev); +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!