aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-04-14 07:33:36 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:35 -0400
commit8b45a209935c4b79905182608922736ba0e5579e (patch)
treed7bb9d5549122d6d8b39305654895fd35e515d05
parent0fc9dec46fae19da9899c580a6b870202103f8bb (diff)
[ALSA] sound: fix platform driver hotplug/coldplug
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable sound platform drivers, to re-enable auto loading. [dbrownell@users.sourceforge.net: more drivers, registration fixes] Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/arm/pxa2xx-ac97.c2
-rw-r--r--sound/drivers/ml403-ac97cr.c4
-rw-r--r--sound/soc/soc-core.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 490729799e59..71fbf8d7ee82 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -424,6 +424,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
424 .resume = pxa2xx_ac97_resume, 424 .resume = pxa2xx_ac97_resume,
425 .driver = { 425 .driver = {
426 .name = "pxa2xx-ac97", 426 .name = "pxa2xx-ac97",
427 .owner = THIS_MODULE,
427 }, 428 },
428}; 429};
429 430
@@ -443,3 +444,4 @@ module_exit(pxa2xx_ac97_exit);
443MODULE_AUTHOR("Nicolas Pitre"); 444MODULE_AUTHOR("Nicolas Pitre");
444MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip"); 445MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
445MODULE_LICENSE("GPL"); 446MODULE_LICENSE("GPL");
447MODULE_ALIAS("platform:pxa2xx-ac97");
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c
index b654007331de..ecdbeb6d3603 100644
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
@@ -1328,11 +1328,15 @@ static int snd_ml403_ac97cr_remove(struct platform_device *pfdev)
1328 return 0; 1328 return 0;
1329} 1329}
1330 1330
1331/* work with hotplug and coldplug */
1332MODULE_ALIAS("platform:" SND_ML403_AC97CR_DRIVER);
1333
1331static struct platform_driver snd_ml403_ac97cr_driver = { 1334static struct platform_driver snd_ml403_ac97cr_driver = {
1332 .probe = snd_ml403_ac97cr_probe, 1335 .probe = snd_ml403_ac97cr_probe,
1333 .remove = snd_ml403_ac97cr_remove, 1336 .remove = snd_ml403_ac97cr_remove,
1334 .driver = { 1337 .driver = {
1335 .name = SND_ML403_AC97CR_DRIVER, 1338 .name = SND_ML403_AC97CR_DRIVER,
1339 .owner = THIS_MODULE,
1336 }, 1340 },
1337}; 1341};
1338 1342
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9eb5479787c1..e148db940cfc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -839,6 +839,7 @@ static int soc_remove(struct platform_device *pdev)
839static struct platform_driver soc_driver = { 839static struct platform_driver soc_driver = {
840 .driver = { 840 .driver = {
841 .name = "soc-audio", 841 .name = "soc-audio",
842 .owner = THIS_MODULE,
842 }, 843 },
843 .probe = soc_probe, 844 .probe = soc_probe,
844 .remove = soc_remove, 845 .remove = soc_remove,
@@ -1601,3 +1602,4 @@ module_exit(snd_soc_exit);
1601MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); 1602MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com");
1602MODULE_DESCRIPTION("ALSA SoC Core"); 1603MODULE_DESCRIPTION("ALSA SoC Core");
1603MODULE_LICENSE("GPL"); 1604MODULE_LICENSE("GPL");
1605MODULE_ALIAS("platform:soc-audio");