ASoC: pxa: Convert imote2 to use snd_soc_register_card()

Use snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 4c9a48bef569b41c57948d43d3dd9d8de8e686b5..b20972dba3f434f5736f8da4875a09247a569d43 100644 (file)
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -593,10 +593,16 @@ static struct pxa2xx_udc_mach_info imote2_udc_info __initdata = {
        .udc_command            = sg2_udc_command,
 };
 
+static struct platform_device imote2_audio_device = {
+       .name = "imote2-audio",
+       .id   = -1,
+};
+
 static struct platform_device *imote2_devices[] = {
        &stargate2_flash_device,
        &imote2_leds,
        &sht15,
+       &imote2_audio_device,
 };
 
 static void __init imote2_init(void)

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index 154fc6f234389e74d4354770b6057074377f6be2..97d3aecfc203a833670756fcbf857b0faeff12d9 100644 (file)
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -70,39 +70,46 @@ static struct snd_soc_dai_link imote2_dai = {
        .ops = &imote2_asoc_ops,
 };
 
-static struct snd_soc_card snd_soc_imote2 = {
+static struct snd_soc_card imote2 = {
        .name = "Imote2",
        .dai_link = &imote2_dai,
        .num_links = 1,
 };
 
-static struct platform_device *imote2_snd_device;
-
-static int __init imote2_asoc_init(void)
+static int __devinit imote2_probe(struct platform_device *pdev)
 {
+       struct snd_soc_card *card = &imote2;
        int ret;
 
-       if (!machine_is_intelmote2())
-               return -ENODEV;
-       imote2_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!imote2_snd_device)
-               return -ENOMEM;
+       card->dev = &pdev->dev;
 
-       platform_set_drvdata(imote2_snd_device, &snd_soc_imote2);
-       ret = platform_device_add(imote2_snd_device);
+       ret = snd_soc_register_card(card);
        if (ret)
-               platform_device_put(imote2_snd_device);
-
+               dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+                       ret);
        return ret;
 }
-module_init(imote2_asoc_init);
 
-static void __exit imote2_asoc_exit(void)
+static int __devexit imote2_remove(struct platform_device *pdev)
 {
-       platform_device_unregister(imote2_snd_device);
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+       snd_soc_unregister_card(card);
+       return 0;
 }
-module_exit(imote2_asoc_exit);
+
+static struct platform_driver imote2_driver = {
+       .driver         = {
+               .name   = "imote2-audio",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = imote2_probe,
+       .remove         = __devexit_p(imote2_remove),
+};
+
+module_platform_driver(imote2_driver);
 
 MODULE_AUTHOR("Jonathan Cameron");
 MODULE_DESCRIPTION("ALSA SoC Imote 2");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:imote2-audio");