[patch 2.6.25-rc9] sound: fix platform driver hotplug/coldplug

[David Brownell]

From: Kay Sievers <kay.sievers@xxxxxxxx>

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform
modalias is prefixed with "platform:". Add MODULE_ALIAS() to the
hotpluggable sound platform drivers, to re-enable auto loading.

[ dbrownell@xxxxxxxxxxxxxxxxxxxxx: more drivers, registration fixes ]
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
---
NOTE:  not sent to subscribers-only list: alsa-devel@xxxxxxxxxxxxxxxx

 sound/arm/pxa2xx-ac97.c      |    2 ++
 sound/drivers/ml403-ac97cr.c |    4 ++++
 sound/soc/soc-core.c         |    2 ++
 3 files changed, 8 insertions(+)

--- g26.orig/sound/arm/pxa2xx-ac97.c	2008-04-13 10:30:20.000000000 -0700
+++ g26/sound/arm/pxa2xx-ac97.c	2008-04-13 10:33:22.000000000 -0700
@@ -391,6 +391,7 @@ static struct platform_driver pxa2xx_ac9
 	.resume		= pxa2xx_ac97_resume,
 	.driver		= {
 		.name	= "pxa2xx-ac97",
+		.owner	= THIS_MODULE,
 	},
 };
 
@@ -410,3 +411,4 @@ module_exit(pxa2xx_ac97_exit);
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-ac97");
--- g26.orig/sound/drivers/ml403-ac97cr.c	2008-04-13 10:32:22.000000000 -0700
+++ g26/sound/drivers/ml403-ac97cr.c	2008-04-13 10:36:29.000000000 -0700
@@ -1330,11 +1330,15 @@ static int snd_ml403_ac97cr_remove(struc
 	return 0;
 }
 
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:" SND_ML403_AC97CR_DRIVER);
+
 static struct platform_driver snd_ml403_ac97cr_driver = {
 	.probe = snd_ml403_ac97cr_probe,
 	.remove = snd_ml403_ac97cr_remove,
 	.driver = {
 		.name = SND_ML403_AC97CR_DRIVER,
+		.owner = THIS_MODULE,
 	},
 };
 
--- g26.orig/sound/soc/soc-core.c	2008-04-13 10:30:20.000000000 -0700
+++ g26/sound/soc/soc-core.c	2008-04-13 10:34:04.000000000 -0700
@@ -839,6 +839,7 @@ static int soc_remove(struct platform_de
 static struct platform_driver soc_driver = {
 	.driver		= {
 		.name		= "soc-audio",
+		.owner		= THIS_MODULE,
 	},
 	.probe		= soc_probe,
 	.remove		= soc_remove,
@@ -1601,3 +1602,4 @@ module_exit(snd_soc_exit);
 MODULE_AUTHOR("Liam Girdwood, liam.girdwood@xxxxxxxxxxxxxxxx, www.wolfsonmicro.com");
 MODULE_DESCRIPTION("ALSA SoC Core");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:soc-audio");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/