Merge branch 'x86-syscall-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / sound / soc / pxa / e750_wm9705.c

diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index ce5f056009a7d5770ae85d4bce9bfff73eb538b7..47b89d71e287bc087640cdf064a7c4f6a92cdfea 100644 (file)
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -116,68 +116,59 @@ static struct snd_soc_dai_link e750_dai[] = {
 
 static struct snd_soc_card e750 = {
        .name = "Toshiba e750",
+       .owner = THIS_MODULE,
        .dai_link = e750_dai,
        .num_links = ARRAY_SIZE(e750_dai),
 };
 
-static struct platform_device *e750_snd_device;
+static struct gpio e750_audio_gpios[] = {
+       { GPIO_E750_HP_AMP_OFF, GPIOF_OUT_INIT_HIGH, "Headphone amp" },
+       { GPIO_E750_SPK_AMP_OFF, GPIOF_OUT_INIT_HIGH, "Speaker amp" },
+};
 
-static int __init e750_init(void)
+static int __devinit e750_probe(struct platform_device *pdev)
 {
+       struct snd_soc_card *card = &e750;
        int ret;
 
-       if (!machine_is_e750())
-               return -ENODEV;
-
-       ret = gpio_request(GPIO_E750_HP_AMP_OFF,  "Headphone amp");
+       ret = gpio_request_array(e750_audio_gpios,
+                                ARRAY_SIZE(e750_audio_gpios));
        if (ret)
                return ret;
 
-       ret = gpio_request(GPIO_E750_SPK_AMP_OFF, "Speaker amp");
-       if (ret)
-               goto free_hp_amp_gpio;
-
-       ret = gpio_direction_output(GPIO_E750_HP_AMP_OFF, 1);
-       if (ret)
-               goto free_spk_amp_gpio;
-
-       ret = gpio_direction_output(GPIO_E750_SPK_AMP_OFF, 1);
-       if (ret)
-               goto free_spk_amp_gpio;
+       card->dev = &pdev->dev;
 
-       e750_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!e750_snd_device) {
-               ret = -ENOMEM;
-               goto free_spk_amp_gpio;
+       ret = snd_soc_register_card(card);
+       if (ret) {
+               dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+                       ret);
+               gpio_free_array(e750_audio_gpios, ARRAY_SIZE(e750_audio_gpios));
        }
-
-       platform_set_drvdata(e750_snd_device, &e750);
-       ret = platform_device_add(e750_snd_device);
-
-       if (!ret)
-               return 0;
-
-/* Fail gracefully */
-       platform_device_put(e750_snd_device);
-free_spk_amp_gpio:
-       gpio_free(GPIO_E750_SPK_AMP_OFF);
-free_hp_amp_gpio:
-       gpio_free(GPIO_E750_HP_AMP_OFF);
-
        return ret;
 }
 
-static void __exit e750_exit(void)
+static int __devexit e750_remove(struct platform_device *pdev)
 {
-       platform_device_unregister(e750_snd_device);
-       gpio_free(GPIO_E750_SPK_AMP_OFF);
-       gpio_free(GPIO_E750_HP_AMP_OFF);
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+       gpio_free_array(e750_audio_gpios, ARRAY_SIZE(e750_audio_gpios));
+       snd_soc_unregister_card(card);
+       return 0;
 }
 
-module_init(e750_init);
-module_exit(e750_exit);
+static struct platform_driver e750_driver = {
+       .driver         = {
+               .name   = "e750-audio",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = e750_probe,
+       .remove         = __devexit_p(e750_remove),
+};
+
+module_platform_driver(e750_driver);
 
 /* Module information */
 MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");
 MODULE_DESCRIPTION("ALSA SoC driver for e750");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:e750-audio");