Commit c94ded6e authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

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

Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.  And fix some __init/__devinit issues.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 38125956
...@@ -589,7 +589,7 @@ snd_wavefront_probe (struct snd_card *card, int dev) ...@@ -589,7 +589,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
return snd_card_register(card); return snd_card_register(card);
} }
static int __init snd_wavefront_nonpnp_probe(struct platform_device *pdev) static int __devinit snd_wavefront_nonpnp_probe(struct platform_device *pdev)
{ {
int dev = pdev->id; int dev = pdev->id;
struct snd_card *card; struct snd_card *card;
...@@ -637,6 +637,7 @@ static struct platform_driver snd_wavefront_driver = { ...@@ -637,6 +637,7 @@ static struct platform_driver snd_wavefront_driver = {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static unsigned int __devinitdata wavefront_pnp_devices;
static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard, static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
const struct pnp_card_device_id *pid) const struct pnp_card_device_id *pid)
...@@ -670,6 +671,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard, ...@@ -670,6 +671,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
pnp_set_card_drvdata(pcard, card); pnp_set_card_drvdata(pcard, card);
dev++; dev++;
wavefront_pnp_devices++;
return 0; return 0;
} }
...@@ -729,10 +731,10 @@ static int __init alsa_card_wavefront_init(void) ...@@ -729,10 +731,10 @@ static int __init alsa_card_wavefront_init(void)
} }
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
i = pnp_register_card_driver(&wavefront_pnpc_driver); err = pnp_register_card_driver(&wavefront_pnpc_driver);
if (i >= 0) { if (!err) {
pnp_registered = 1; pnp_registered = 1;
cards += i; cards += wavefront_pnp_devices;
} }
#endif #endif
......
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