Skip to content

L
linux
Commit f04329ac authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds
Browse files
Options

[PATCH] pnp_activate_dev API changes. 

Someone nuked the 2nd arg in 2.5.62, but didn't fix up
all the callers. Lazy.
parent 22c5563a
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
drivers/isdn/hisax/asuscom.c
View file @ f04329ac
...@@ -283,7 +283,7 @@ setup_asuscom(struct IsdnCard *card) ...@@ -283,7 +283,7 @@ setup_asuscom(struct IsdnCard *card)
printk(KERN_ERR "AsusPnP: attach failed\n"); printk(KERN_ERR "AsusPnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "AsusPnP: activate failed\n"); printk(KERN_ERR "AsusPnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/avm_pci.c
View file @ f04329ac
...@@ -632,7 +632,7 @@ setup_avm_pcipnp(struct IsdnCard *card) ...@@ -632,7 +632,7 @@ setup_avm_pcipnp(struct IsdnCard *card)
printk(KERN_ERR "FritzPnP: attach failed\n"); printk(KERN_ERR "FritzPnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pnp_avm, NULL) < 0) { if (pnp_activate_dev(pnp_avm) < 0) {
printk(KERN_ERR "FritzPnP: activate failed\n"); printk(KERN_ERR "FritzPnP: activate failed\n");
pnp_device_detach(pnp_avm); pnp_device_detach(pnp_avm);
return 0; return 0;
......
drivers/isdn/hisax/diva.c
View file @ f04329ac
...@@ -600,7 +600,7 @@ setup_diva(struct IsdnCard *card) ...@@ -600,7 +600,7 @@ setup_diva(struct IsdnCard *card)
printk(KERN_ERR "Diva PnP: attach failed\n"); printk(KERN_ERR "Diva PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "Diva PnP: activate failed\n"); printk(KERN_ERR "Diva PnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/elsa.c
View file @ f04329ac
...@@ -864,7 +864,7 @@ setup_elsa(struct IsdnCard *card) ...@@ -864,7 +864,7 @@ setup_elsa(struct IsdnCard *card)
printk(KERN_ERR "Elsa PnP: attach failed\n"); printk(KERN_ERR "Elsa PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
pnp_device_detach(pd); pnp_device_detach(pd);
printk(KERN_ERR "Elsa PnP: activate failed\n"); printk(KERN_ERR "Elsa PnP: activate failed\n");
return 0; return 0;
......
drivers/isdn/hisax/hfc_sx.c
View file @ f04329ac
...@@ -1200,7 +1200,7 @@ setup_hfcsx(struct IsdnCard *card) ...@@ -1200,7 +1200,7 @@ setup_hfcsx(struct IsdnCard *card)
printk(KERN_ERR "HFC PnP: attach failed\n"); printk(KERN_ERR "HFC PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "HFC PnP: activate failed\n"); printk(KERN_ERR "HFC PnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/hfcscard.c
View file @ f04329ac
...@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card) ...@@ -193,7 +193,7 @@ setup_hfcs(struct IsdnCard *card)
printk(KERN_ERR "HFC PnP: attach failed\n"); printk(KERN_ERR "HFC PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "HFC PnP: activate failed\n"); printk(KERN_ERR "HFC PnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/isurf.c
View file @ f04329ac
...@@ -223,7 +223,7 @@ setup_isurf(struct IsdnCard *card) ...@@ -223,7 +223,7 @@ setup_isurf(struct IsdnCard *card)
printk(KERN_ERR "ISurfPnP: attach failed\n"); printk(KERN_ERR "ISurfPnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "ISurfPnP: activate failed\n"); printk(KERN_ERR "ISurfPnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/ix1_micro.c
View file @ f04329ac
...@@ -208,7 +208,7 @@ setup_ix1micro(struct IsdnCard *card) ...@@ -208,7 +208,7 @@ setup_ix1micro(struct IsdnCard *card)
printk(KERN_ERR "ITK PnP: attach failed\n"); printk(KERN_ERR "ITK PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "ITK PnP: activate failed\n"); printk(KERN_ERR "ITK PnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/niccy.c
View file @ f04329ac
...@@ -232,7 +232,7 @@ setup_niccy(struct IsdnCard *card) ...@@ -232,7 +232,7 @@ setup_niccy(struct IsdnCard *card)
printk(KERN_ERR "NiccyPnP: attach failed\n"); printk(KERN_ERR "NiccyPnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "NiccyPnP: activate failed\n"); printk(KERN_ERR "NiccyPnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/sedlbauer.c
View file @ f04329ac
...@@ -524,7 +524,7 @@ setup_sedlbauer(struct IsdnCard *card) ...@@ -524,7 +524,7 @@ setup_sedlbauer(struct IsdnCard *card)
printk(KERN_ERR "Sedlbauer PnP: attach failed\n"); printk(KERN_ERR "Sedlbauer PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pd, NULL) < 0) { if (pnp_activate_dev(pd) < 0) {
printk(KERN_ERR "Sedlbauer PnP: activate failed\n"); printk(KERN_ERR "Sedlbauer PnP: activate failed\n");
pnp_device_detach(pd); pnp_device_detach(pd);
return 0; return 0;
......
drivers/isdn/hisax/teles3.c
View file @ f04329ac
...@@ -227,7 +227,7 @@ setup_teles3(struct IsdnCard *card) ...@@ -227,7 +227,7 @@ setup_teles3(struct IsdnCard *card)
printk(KERN_ERR "Teles PnP: attach failed\n"); printk(KERN_ERR "Teles PnP: attach failed\n");
return 0; return 0;
} }
if (pnp_activate_dev(pnp_dev, NULL) < 0) { if (pnp_activate_dev(pnp_dev) < 0) {
printk(KERN_ERR "Teles PnP: activate failed\n"); printk(KERN_ERR "Teles PnP: activate failed\n");
pnp_device_detach(pnp_dev); pnp_device_detach(pnp_dev);
return 0; return 0;
......
drivers/media/radio/radio-sf16fmi.c
View file @ f04329ac
...@@ -262,7 +262,7 @@ static int isapnp_fmi_probe(void) ...@@ -262,7 +262,7 @@ static int isapnp_fmi_probe(void)
return -ENODEV; return -ENODEV;
if (pnp_device_attach(dev) < 0) if (pnp_device_attach(dev) < 0)
return -EAGAIN; return -EAGAIN;
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
printk ("radio-sf16fmi: PnP configure failed (out of resources?)\n"); printk ("radio-sf16fmi: PnP configure failed (out of resources?)\n");
pnp_device_detach(dev); pnp_device_detach(dev);
return -ENOMEM; return -ENOMEM;
......
drivers/net/3c509.c
View file @ f04329ac
...@@ -385,7 +385,7 @@ static int __init el3_probe(int card_idx) ...@@ -385,7 +385,7 @@ static int __init el3_probe(int card_idx)
idev))) { idev))) {
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev, NULL) < 0) { if (pnp_activate_dev(idev) < 0) {
__again: __again:
pnp_device_detach(idev); pnp_device_detach(idev);
continue; continue;
......
drivers/net/3c515.c
View file @ f04329ac
...@@ -469,7 +469,7 @@ static int corkscrew_scan(struct net_device *dev) ...@@ -469,7 +469,7 @@ static int corkscrew_scan(struct net_device *dev)
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev, NULL) < 0) { if (pnp_activate_dev(idev) < 0) {
printk("pnp activate failed (out of resources?)\n"); printk("pnp activate failed (out of resources?)\n");
pnp_device_detach(idev); pnp_device_detach(idev);
return -ENOMEM; return -ENOMEM;
......
drivers/net/ne.c
View file @ f04329ac
...@@ -205,7 +205,7 @@ static int __init ne_probe_isapnp(struct net_device *dev) ...@@ -205,7 +205,7 @@ static int __init ne_probe_isapnp(struct net_device *dev)
/* Avoid already found cards from previous calls */ /* Avoid already found cards from previous calls */
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev, NULL) < 0) { if (pnp_activate_dev(idev) < 0) {
pnp_device_detach(idev); pnp_device_detach(idev);
continue; continue;
} }
......
drivers/net/sb1000.c
View file @ f04329ac
...@@ -170,7 +170,7 @@ sb1000_probe(struct net_device *dev) ...@@ -170,7 +170,7 @@ sb1000_probe(struct net_device *dev)
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev, NULL) < 0) { if (pnp_activate_dev(idev) < 0) {
__again: __again:
pnp_device_detach(idev); pnp_device_detach(idev);
continue; continue;
......
drivers/net/smc-ultra.c
View file @ f04329ac
...@@ -293,7 +293,7 @@ static int __init ultra_probe_isapnp(struct net_device *dev) ...@@ -293,7 +293,7 @@ static int __init ultra_probe_isapnp(struct net_device *dev)
/* Avoid already found cards from previous calls */ /* Avoid already found cards from previous calls */
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev, NULL) < 0) { if (pnp_activate_dev(idev) < 0) {
__again: __again:
pnp_device_detach(idev); pnp_device_detach(idev);
continue; continue;
......
drivers/pcmcia/i82365.c
View file @ f04329ac
...@@ -846,7 +846,7 @@ static void __init isa_probe(void) ...@@ -846,7 +846,7 @@ static void __init isa_probe(void)
printk("PNP "); printk("PNP ");
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
printk("activate failed\n"); printk("activate failed\n");
pnp_device_detach(dev); pnp_device_detach(dev);
break; break;
......
drivers/scsi/aha152x.c
View file @ f04329ac
...@@ -1131,7 +1131,7 @@ int aha152x_detect(Scsi_Host_Template * tpnt) ...@@ -1131,7 +1131,7 @@ int aha152x_detect(Scsi_Host_Template * tpnt)
while ( setup_count<ARRAY_SIZE(setup) && (dev=pnp_find_dev(NULL, ISAPNP_VENDOR('A','D','P'), ISAPNP_FUNCTION(0x1505), dev)) ) { while ( setup_count<ARRAY_SIZE(setup) && (dev=pnp_find_dev(NULL, ISAPNP_VENDOR('A','D','P'), ISAPNP_FUNCTION(0x1505), dev)) ) {
if (pnp_device_attach(dev) < 0) if (pnp_device_attach(dev) < 0)
continue; continue;
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
pnp_device_detach(dev); pnp_device_detach(dev);
continue; continue;
} }
......
drivers/scsi/aha1542.c
View file @ f04329ac
...@@ -1161,7 +1161,7 @@ static int __init aha1542_detect(Scsi_Host_Template * tpnt) ...@@ -1161,7 +1161,7 @@ static int __init aha1542_detect(Scsi_Host_Template * tpnt)
if(pnp_device_attach(pdev)<0) if(pnp_device_attach(pdev)<0)
continue; continue;
if(pnp_activate_dev(pdev, NULL)<0) { if(pnp_activate_dev(pdev)<0) {
pnp_device_detach(pdev); pnp_device_detach(pdev);
continue; continue;
} }
......
drivers/scsi/g_NCR5380.c
View file @ f04329ac
...@@ -323,7 +323,7 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt) ...@@ -323,7 +323,7 @@ int __init generic_NCR5380_detect(Scsi_Host_Template * tpnt)
printk(KERN_ERR "dtc436e probe: attach failed\n"); printk(KERN_ERR "dtc436e probe: attach failed\n");
continue; continue;
} }
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
printk(KERN_ERR "dtc436e probe: activate failed\n"); printk(KERN_ERR "dtc436e probe: activate failed\n");
pnp_device_detach(dev); pnp_device_detach(dev);
continue; continue;
......
drivers/scsi/sym53c416.c
View file @ f04329ac
...@@ -679,7 +679,7 @@ int __init sym53c416_detect(Scsi_Host_Template *tpnt) ...@@ -679,7 +679,7 @@ int __init sym53c416_detect(Scsi_Host_Template *tpnt)
printk(KERN_WARNING "sym53c416: unable to attach PnP device.\n"); printk(KERN_WARNING "sym53c416: unable to attach PnP device.\n");
continue; continue;
} }
if(pnp_activate_dev(idev, NULL)<0) if(pnp_activate_dev(idev)<0)
{ {
printk(KERN_WARNING "sym53c416: unable to activate PnP device.\n"); printk(KERN_WARNING "sym53c416: unable to activate PnP device.\n");
pnp_device_detach(idev); pnp_device_detach(idev);
......
drivers/telephony/ixj.c
View file @ f04329ac
...@@ -7717,7 +7717,7 @@ int __init ixj_probe_isapnp(int *cnt) ...@@ -7717,7 +7717,7 @@ int __init ixj_probe_isapnp(int *cnt)
printk("pnp attach failed %d \n", result); printk("pnp attach failed %d \n", result);
break; break;
} }
if (pnp_activate_dev(dev, NULL) < 0) { if (pnp_activate_dev(dev) < 0) {
printk("pnp activate failed (out of resources?)\n"); printk("pnp activate failed (out of resources?)\n");
pnp_device_detach(dev); pnp_device_detach(dev);
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7