leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] PNP: adjust pnp_register_card_driver() signature: es18xx

Browse Source 
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>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Bjorn Helgaas 2006-03-27 01:17:13 -08:00 committed by Linus Torvalds
parent 6736a6587b
commit fea9739f2a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/isa/es18xx.c
View File

@ -2204,7 +2204,7 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
return snd_card_register(card); 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; struct snd_card *card;
int err; int err;
@ -2221,7 +2221,7 @@ static int __init snd_es18xx_nonpnp_probe1(int dev, struct platform_device *devp
return 0; 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 dev = pdev->id;
int err; int err;
@ -2297,6 +2297,8 @@ static struct platform_driver snd_es18xx_nonpnp_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static unsigned int __devinitdata es18xx_pnp_devices;
static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard, static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
{ {
@ -2327,6 +2329,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *pcard,
pnp_set_card_drvdata(pcard, card); pnp_set_card_drvdata(pcard, card);
dev++; dev++;
es18xx_pnp_devices++;
return 0; return 0;
} }
@ -2397,10 +2400,10 @@ static int __init alsa_card_es18xx_init(void)
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
i = pnp_register_card_driver(&es18xx_pnpc_driver); err = pnp_register_card_driver(&es18xx_pnpc_driver);
if (i >= 0) { if (!err) {
pnp_registered = 1; pnp_registered = 1;
cards += i; cards += es18xx_pnp_devices;
} }
#endif #endif