ISDN: Change pci_find_device() calls to pci_get_device()
PATCH 1/1 ISDN: Change pci_find_device() calls to pci_get_device()
The following patch removes the obsolete pci_find_device() calls and replaces them with pci_get_device() for all ISDN drivers.
Compilation is fine but I haven't tested it since I don't own a ISDN card. Should be fine since the return value and parameters of pci_find_device() and pci_get_device() are the same.
The is my first patch so be nice to me :)
I hope it's not too long, I can split it if you prefer.
drivers/isdn/hisax/avm_pci.c +1 -1
@@ -789,7 +789,7 @@ setup_avm_pcipnp(struct IsdnCard *card) }#endif #ifdef CONFIG_PCI -if ((dev_avm =pci_get_device (PCI_VENDOR_ID_AVM , +if ((dev_avm =pci_find_device (PCI_VENDOR_ID_AVM ,PCI_DEVICE_ID_AVM_A1 , dev_avm))) {if (pci_enable_device (dev_avm))return (0 );
drivers/isdn/hisax/bkm_a4t.c +1 -1
@@ -340,7 +340,7 @@ setup_bkm_a4t(struct IsdnCard *card) }else return (0 ); -while ((dev_a4t =pci_get_device (PCI_VENDOR_ID_ZORAN , +while ((dev_a4t =pci_find_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_a4t))) { ret =a4t_pci_probe (dev_a4t, cs, &found, &pci_memaddr);if (!ret)
drivers/isdn/hisax/bkm_a8.c +1 -1
@@ -309,7 +309,7 @@ setup_sct_quadro(struct IsdnCard *card) (sub_vendor_id != PCI_VENDOR_ID_BERKOM)))return (0 );if (cs->subtyp ==SCT_1 ) { -while ((dev_a8 =pci_get_device (PCI_VENDOR_ID_PLX , +while ((dev_a8 =pci_find_device (PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_9050 , dev_a8))) { sub_vendor_id = dev_a8->subsystem_vendor;
drivers/isdn/hisax/diva.c +4 -4
@@ -1047,21 +1047,21 @@ setup_diva(struct IsdnCard *card)#endif #ifdef CONFIG_PCI cs->subtyp = 0; - if ((dev_diva = pci_get_device(PCI_VENDOR_ID_EICON, + if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { if (pci_enable_device(dev_diva)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); - } else if ((dev_diva_u = pci_get_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { if (pci_enable_device(dev_diva_u)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva_u->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); - } else if ((dev_diva201 = pci_get_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) return(0);
@@ -1071,7 +1071,7 @@ setup_diva(struct IsdnCard *card) (ulong )ioremap (pci_resource_start (dev_diva201,0 ),4096 ); cs->hw.diva.cfg_reg = (ulong )ioremap (pci_resource_start (dev_diva201,1 ),4096 ); - }else if ((dev_diva202 =pci_get_device (PCI_VENDOR_ID_EICON , + }else if ((dev_diva202 =pci_find_device (PCI_VENDOR_ID_EICON ,PCI_DEVICE_ID_EICON_DIVA202 , dev_diva202))) {if (pci_enable_device (dev_diva202))return (0 );
drivers/isdn/hisax/elsa.c +2 -2
@@ -1021,7 +1021,7 @@ setup_elsa(struct IsdnCard *card) }else if (cs->typ ==ISDN_CTYPE_ELSA_PCI ) {#ifdef CONFIG_PCI cs->subtyp =0 ; -if ((dev_qs1000 =pci_get_device (PCI_VENDOR_ID_ELSA , +if ((dev_qs1000 =pci_find_device (PCI_VENDOR_ID_ELSA ,PCI_DEVICE_ID_ELSA_MICROLINK , dev_qs1000))) {if (pci_enable_device (dev_qs1000))return (0 );
@@ -1029,7 +1029,7 @@ setup_elsa(struct IsdnCard *card) cs->irq = dev_qs1000->irq; cs->hw.elsa.cfg =pci_resource_start (dev_qs1000,1 ); cs->hw.elsa.base =pci_resource_start (dev_qs1000,3 ); - }else if ((dev_qs3000 =pci_get_device (PCI_VENDOR_ID_ELSA , + }else if ((dev_qs3000 =pci_find_device (PCI_VENDOR_ID_ELSA ,PCI_DEVICE_ID_ELSA_QS3000 , dev_qs3000))) {if (pci_enable_device (dev_qs3000))return (0 );
drivers/isdn/hisax/enternow_pci.c +1 -1
@@ -406,7 +406,7 @@ setup_enternow_pci(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =en_pci_probe (dev_netjet, cs);if (!ret)
drivers/isdn/hisax/gazel.c +1 -1
@@ -546,7 +546,7 @@ setup_gazelpci(struct IsdnCardState *cs) found =0 ; seekcard =PCI_DEVICE_ID_PLX_R685 ;for (nbseek =0 ; nbseek <4 ; nbseek++) { -if ((dev_tel =pci_get_device (PCI_VENDOR_ID_PLX , +if ((dev_tel =pci_find_device (PCI_VENDOR_ID_PLX , seekcard, dev_tel))) {if (pci_enable_device (dev_tel))return 1 ;
drivers/isdn/hisax/hfc_pci.c +1 -1
@@ -1660,7 +1660,7 @@ setup_hfcpci(struct IsdnCard *card) i =0 ;while (id_list[i].vendor_id) { - tmp_hfcpci =pci_get_device (id_list[i].vendor_id, + tmp_hfcpci =pci_find_device (id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++;
drivers/isdn/hisax/niccy.c +1 -1
@@ -302,7 +302,7 @@ int __devinit setup_niccy(struct IsdnCard *card)#ifdef CONFIG_PCI u_int pci_ioaddr; cs->subtyp =0 ; -if ((niccy_dev =pci_get_device (PCI_VENDOR_ID_SATSAGEM , +if ((niccy_dev =pci_find_device (PCI_VENDOR_ID_SATSAGEM ,PCI_DEVICE_ID_SATSAGEM_NICCY , niccy_dev))) {if (pci_enable_device (niccy_dev))
drivers/isdn/hisax/nj_s.c +1 -1
@@ -277,7 +277,7 @@ setup_netjet_s(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =njs_pci_probe (dev_netjet, cs);if (!ret)
drivers/isdn/hisax/nj_u.c +1 -1
@@ -240,7 +240,7 @@ setup_netjet_u(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =nju_pci_probe (dev_netjet, cs);if (!ret)
drivers/isdn/hisax/sedlbauer.c +1 -1
@@ -624,7 +624,7 @@ setup_sedlbauer(struct IsdnCard *card)#endif /* Probe for Sedlbauer speed pci */ #ifdef CONFIG_PCI -if ((dev_sedl =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_sedl =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_100 , dev_sedl))) {if (pci_enable_device (dev_sedl))return (0 );
drivers/isdn/hisax/telespci.c +1 -1
@@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card)if (cs->typ !=ISDN_CTYPE_TELESPCI )return (0 );#ifdef CONFIG_PCI -if ((dev_tel =pci_get_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_tel))) { +if ((dev_tel =pci_find_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_tel))) {if (pci_enable_device (dev_tel))return (0 ); cs->irq = dev_tel->irq;
drivers/isdn/hisax/w6692.c +1 -1
@@ -1011,7 +1011,7 @@ setup_w6692(struct IsdnCard *card)return (0 );#ifdef CONFIG_PCI while (id_list[id_idx].vendor_id) { - dev_w6692 =pci_get_device (id_list[id_idx].vendor_id, + dev_w6692 =pci_find_device (id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692);if (dev_w6692) {
drivers/isdn/hysdn/hysdn_init.c +1 -1
@@ -76,7 +76,7 @@ search_cards(void) card_root =NULL ; card_last =NULL ; -while ((akt_pcidev =pci_get_device (PCI_VENDOR_ID_HYPERCOPE ,PCI_DEVICE_ID_HYPERCOPE_PLX , +while ((akt_pcidev =pci_find_device (PCI_VENDOR_ID_HYPERCOPE ,PCI_DEVICE_ID_HYPERCOPE_PLX , akt_pcidev)) !=NULL ) {if (pci_enable_device (akt_pcidev))continue ;
Signature · 5 lines
Gregory 'GaLi' Cavelier
_
ASCII ribbon campaign ( )
- against HTML email X
& vCards / \Quoted 3 lines · Gregory 'GaLi' Cavelier
The following patch removes the obsolete
pci_find_device()calls and replaces them withpci_get_device()for all ISDN drivers.
No, it does not. It replaces the correct pci_get_device() calls in the isdn tree with the obsolete pci_find_device(). ;-)
regards,
Andre
Wow, how stupid am i ?!?
Did 'git-diff gali master' instead of 'git-diff master gali'
Anyway, going out slapping myself, sorry for the noise...
Quoted 10 lines · On Fri, 21 Sep 2007 11:44:22 +0200 Andre Haupt <[email protected]> wrote:
Quoted 3 lines · Gregory 'GaLi' Cavelier
The following patch removes the obsolete
pci_find_device()calls and replaces them withpci_get_device()for all ISDN drivers.No, it does not. It replaces the correct
pci_get_device()calls in the isdn tree with the obsoletepci_find_device(). ;-)regards,
Andre
Signature · 5 lines
Gregory 'GaLi' Cavelier
_
ASCII ribbon campaign ( )
- against HTML email X
& vCards / \Quoted 5 lines · Gregory 'GaLi' Cavelier
The following patch removes the obsolete
pci_find_device()calls and replaces them withpci_get_device()for all ISDN drivers.Compilation is fine but I haven't tested it since I don't own a ISDN card. Should be fine since the return value and parameters of
pci_find_device()andpci_get_device()are the same.The is my first patch so be nice to me :)
I'll try to be nice:-)
Kindly check the linux kernel archives before you start of with any patches in the kernel.
archives can be found here http://marc.info/?l=linux-kernel&w=2
Quoted 227 lines
I hope it's not too long, I can split it if you prefer.
Signed-off-by Gregory 'GaLi' Cavelier <[email protected]>drivers/isdn/hisax/avm_pci.c +1
-1@@ -789,7 +789,7 @@ setup_avm_pcipnp(struct IsdnCard *card) }#endif #ifdef CONFIG_PCI -if ((dev_avm =pci_get_device (PCI_VENDOR_ID_AVM , +if ((dev_avm =pci_find_device (PCI_VENDOR_ID_AVM ,PCI_DEVICE_ID_AVM_A1 , dev_avm))) {if (pci_enable_device (dev_avm))return (0 );drivers/isdn/hisax/bkm_a4t.c +1
-1@@ -340,7 +340,7 @@ setup_bkm_a4t(struct IsdnCard *card) }else return (0 ); -while ((dev_a4t =pci_get_device (PCI_VENDOR_ID_ZORAN , +while ((dev_a4t =pci_find_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_a4t))) { ret =a4t_pci_probe (dev_a4t, cs, &found, &pci_memaddr);if (!ret)drivers/isdn/hisax/bkm_a8.c +1
-1@@ -309,7 +309,7 @@ setup_sct_quadro(struct IsdnCard *card) (sub_vendor_id != PCI_VENDOR_ID_BERKOM)))return (0 );if (cs->subtyp ==SCT_1 ) { -while ((dev_a8 =pci_get_device (PCI_VENDOR_ID_PLX , +while ((dev_a8 =pci_find_device (PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_9050 , dev_a8))) { sub_vendor_id = dev_a8->subsystem_vendor;drivers/isdn/hisax/diva.c +4
-4@@ -1047,21 +1047,21 @@ setup_diva(struct IsdnCard *card)#endif #ifdef CONFIG_PCI cs->subtyp = 0; - if ((dev_diva = pci_get_device(PCI_VENDOR_ID_EICON, + if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { if (pci_enable_device(dev_diva)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); - } else if ((dev_diva_u = pci_get_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { if (pci_enable_device(dev_diva_u)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva_u->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); - } else if ((dev_diva201 = pci_get_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) return(0);@@ -1071,7 +1071,7 @@ setup_diva(struct IsdnCard *card) (ulong )ioremap (pci_resource_start (dev_diva201,0 ),4096 ); cs->hw.diva.cfg_reg = (ulong )ioremap (pci_resource_start (dev_diva201,1 ),4096 ); - }else if ((dev_diva202 =pci_get_device (PCI_VENDOR_ID_EICON , + }else if ((dev_diva202 =pci_find_device (PCI_VENDOR_ID_EICON ,PCI_DEVICE_ID_EICON_DIVA202 , dev_diva202))) {if (pci_enable_device (dev_diva202))return (0 );drivers/isdn/hisax/elsa.c +2
-2@@ -1021,7 +1021,7 @@ setup_elsa(struct IsdnCard *card) }else if (cs->typ ==ISDN_CTYPE_ELSA_PCI ) {#ifdef CONFIG_PCI cs->subtyp =0 ; -if ((dev_qs1000 =pci_get_device (PCI_VENDOR_ID_ELSA , +if ((dev_qs1000 =pci_find_device (PCI_VENDOR_ID_ELSA ,PCI_DEVICE_ID_ELSA_MICROLINK , dev_qs1000))) {if (pci_enable_device (dev_qs1000))return (0 );@@ -1029,7 +1029,7 @@ setup_elsa(struct IsdnCard *card) cs->irq = dev_qs1000->irq; cs->hw.elsa.cfg =pci_resource_start (dev_qs1000,1 ); cs->hw.elsa.base =pci_resource_start (dev_qs1000,3 ); - }else if ((dev_qs3000 =pci_get_device (PCI_VENDOR_ID_ELSA , + }else if ((dev_qs3000 =pci_find_device (PCI_VENDOR_ID_ELSA ,PCI_DEVICE_ID_ELSA_QS3000 , dev_qs3000))) {if (pci_enable_device (dev_qs3000))return (0 );drivers/isdn/hisax/enternow_pci.c +1
-1@@ -406,7 +406,7 @@ setup_enternow_pci(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =en_pci_probe (dev_netjet, cs);if (!ret)drivers/isdn/hisax/gazel.c +1
-1@@ -546,7 +546,7 @@ setup_gazelpci(struct IsdnCardState *cs) found =0 ; seekcard =PCI_DEVICE_ID_PLX_R685 ;for (nbseek =0 ; nbseek <4 ; nbseek++) { -if ((dev_tel =pci_get_device (PCI_VENDOR_ID_PLX , +if ((dev_tel =pci_find_device (PCI_VENDOR_ID_PLX , seekcard, dev_tel))) {if (pci_enable_device (dev_tel))return 1 ;drivers/isdn/hisax/hfc_pci.c +1
-1@@ -1660,7 +1660,7 @@ setup_hfcpci(struct IsdnCard *card) i =0 ;while (id_list[i].vendor_id) { - tmp_hfcpci =pci_get_device (id_list[i].vendor_id, + tmp_hfcpci =pci_find_device (id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++;drivers/isdn/hisax/niccy.c +1
-1@@ -302,7 +302,7 @@ int __devinit setup_niccy(struct IsdnCard *card)#ifdef CONFIG_PCI u_int pci_ioaddr; cs->subtyp =0 ; -if ((niccy_dev =pci_get_device (PCI_VENDOR_ID_SATSAGEM , +if ((niccy_dev =pci_find_device (PCI_VENDOR_ID_SATSAGEM ,PCI_DEVICE_ID_SATSAGEM_NICCY , niccy_dev))) {if (pci_enable_device (niccy_dev))drivers/isdn/hisax/nj_s.c +1
-1@@ -277,7 +277,7 @@ setup_netjet_s(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =njs_pci_probe (dev_netjet, cs);if (!ret)drivers/isdn/hisax/nj_u.c +1
-1@@ -240,7 +240,7 @@ setup_netjet_u(struct IsdnCard *card)for ( ;; ) { -if ((dev_netjet =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_netjet =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_300 , dev_netjet))) { ret =nju_pci_probe (dev_netjet, cs);if (!ret)drivers/isdn/hisax/sedlbauer.c +1
-1@@ -624,7 +624,7 @@ setup_sedlbauer(struct IsdnCard *card)#endif /* Probe for Sedlbauer speed pci */ #ifdef CONFIG_PCI -if ((dev_sedl =pci_get_device (PCI_VENDOR_ID_TIGERJET , +if ((dev_sedl =pci_find_device (PCI_VENDOR_ID_TIGERJET ,PCI_DEVICE_ID_TIGERJET_100 , dev_sedl))) {if (pci_enable_device (dev_sedl))return (0 );drivers/isdn/hisax/telespci.c +1
-1@@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card)if (cs->typ !=ISDN_CTYPE_TELESPCI )return (0 );#ifdef CONFIG_PCI -if ((dev_tel =pci_get_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_tel))) { +if ((dev_tel =pci_find_device (PCI_VENDOR_ID_ZORAN ,PCI_DEVICE_ID_ZORAN_36120 , dev_tel))) {if (pci_enable_device (dev_tel))return (0 ); cs->irq = dev_tel->irq;drivers/isdn/hisax/w6692.c +1
-1@@ -1011,7 +1011,7 @@ setup_w6692(struct IsdnCard *card)return (0 );#ifdef CONFIG_PCI while (id_list[id_idx].vendor_id) { - dev_w6692 =pci_get_device (id_list[id_idx].vendor_id, + dev_w6692 =pci_find_device (id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692);if (dev_w6692) {drivers/isdn/hysdn/hysdn_init.c +0
-0
drivers/isdn/hysdn/hysdn_init.c search_cards(void) · line 82
Quoted 8 lines
drivers/isdn/hysdn/hysdn_init.c +1
-1@@ -76,7 +76,7 @@ search_cards(void) card_root =NULL ; card_last =NULL ; -while ((akt_pcidev =pci_get_device (PCI_VENDOR_ID_HYPERCOPE ,PCI_DEVICE_ID_HYPERCOPE_PLX , +while ((akt_pcidev =pci_find_device (PCI_VENDOR_ID_HYPERCOPE ,PCI_DEVICE_ID_HYPERCOPE_PLX , akt_pcidev)) !=NULL ) {if (pci_enable_device (akt_pcidev))continue ;
-surya.
Hi Gregory.
Quoted 6 lines · Gregory 'GaLi' Cavelier
The following patch removes the obsolete
pci_find_device()calls and replaces them withpci_get_device()for all ISDN drivers.Compilation is fine but I haven't tested it since I don't own a ISDN card. Should be fine since the return value and parameters of
pci_find_device()andpci_get_device()are the same.The is my first patch so be nice to me :)
Jeff Garzik has been doing a lot of work lately on the ISDN subsystem. So please check his work to avoid doing the same work twice.
Of benefit for everyone would be a throughfull review of the changes Jeff made. It is a nice learning expericen if not anything else.
You can find the ISDN change in one of the branches in Jeff's public treee's at git.kernel.org.
Try also to seach the lkml archives for his work.
All that said I have not chacked if he addressed this specific cleanup.
Sam