Messages in this thread Patch in this message | | | From | Bjorn Helgaas <> | Subject | [PATCH 6/12] PNP: adjust pnp_register_card_driver() signature | Date | Wed, 22 Mar 2006 15:12:41 -0700 |
| |
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Index: work-mm6/sound/isa/es18xx.c =================================================================== --- work-mm6.orig/sound/isa/es18xx.c 2006-03-22 11:24:41.000000000 -0700 +++ work-mm6/sound/isa/es18xx.c 2006-03-22 12:05:00.000000000 -0700 @@ -2203,7 +2203,7 @@ return snd_card_register(card); } -static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr) +static int __devinit snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devptr) { struct snd_card *card; int err; @@ -2220,7 +2220,7 @@ return 0; } -static int __init snd_es18xx_nonpnp_probe(struct platform_device *pdev) +static int __devinit snd_es18xx_nonpnp_probe(struct platform_device *pdev) { int dev = pdev->id; int err; @@ -2296,6 +2296,8 @@ #ifdef CONFIG_PNP +static unsigned int __devinitdata es18xx_pnp_devices; + static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard, const struct pnp_card_device_id *pid) { @@ -2326,6 +2328,7 @@ pnp_set_card_drvdata(pcard, card); dev++; + es18xx_pnp_devices++; return 0; } @@ -2396,10 +2399,10 @@ } #ifdef CONFIG_PNP - i = pnp_register_card_driver(&es18xx_pnpc_driver); - if (i >= 0) { + err = pnp_register_card_driver(&es18xx_pnpc_driver); + if (!err) { pnp_registered = 1; - cards += i; + cards += es18xx_pnp_devices; } #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |