Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / sound / soc / s3c24xx / smdk_wm9713.c

diff --git a/sound/soc/s3c24xx/smdk_wm9713.c b/sound/soc/s3c24xx/smdk_wm9713.c
index 5527b9e88c98ee9f7772a002db499e6e0e274717..33ba8fdbcf07c2a0845caca16f39bba5d3bbc6bb 100644 (file)
--- a/sound/soc/s3c24xx/smdk_wm9713.c
+++ b/sound/soc/s3c24xx/smdk_wm9713.c
@@ -15,7 +15,6 @@
 #include <linux/device.h>
 #include <sound/soc.h>
 
-#include "../codecs/wm9713.h"
 #include "s3c-dma.h"
 #include "s3c-ac97.h"
 
@@ -46,46 +45,57 @@ static struct snd_soc_card smdk;
 static struct snd_soc_dai_link smdk_dai = {
        .name = "AC97",
        .stream_name = "AC97 PCM",
-       .cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM],
-       .codec_dai = &wm9713_dai[WM9713_DAI_AC97_HIFI],
+       .platform_name = "s3c24xx-pcm-audio",
+       .cpu_dai_name = "s3c-ac97",
+       .codec_dai_name = "wm9713-hifi",
+       .codec_name = "wm9713-codec",
 };
 
 static struct snd_soc_card smdk = {
-       .name = "SMDK",
-       .platform = &s3c24xx_soc_platform,
+       .name = "SMDK WM9713",
        .dai_link = &smdk_dai,
        .num_links = 1,
 };
 
-static struct snd_soc_device smdk_snd_ac97_devdata = {
-       .card = &smdk,
-       .codec_dev = &soc_codec_dev_wm9713,
-};
-
+static struct platform_device *smdk_snd_wm9713_device;
 static struct platform_device *smdk_snd_ac97_device;
 
 static int __init smdk_init(void)
 {
        int ret;
 
-       smdk_snd_ac97_device = platform_device_alloc("soc-audio", -1);
-       if (!smdk_snd_ac97_device)
+       smdk_snd_wm9713_device = platform_device_alloc("wm9713-codec", -1);
+       if (!smdk_snd_wm9713_device)
                return -ENOMEM;
 
-       platform_set_drvdata(smdk_snd_ac97_device,
-                            &smdk_snd_ac97_devdata);
-       smdk_snd_ac97_devdata.dev = &smdk_snd_ac97_device->dev;
+       ret = platform_device_add(smdk_snd_wm9713_device);
+       if (ret)
+               goto err;
+
+       smdk_snd_ac97_device = platform_device_alloc("soc-audio", -1);
+       if (!smdk_snd_ac97_device) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       platform_set_drvdata(smdk_snd_ac97_device, &smdk);
 
        ret = platform_device_add(smdk_snd_ac97_device);
-       if (ret)
+       if (ret) {
                platform_device_put(smdk_snd_ac97_device);
+               goto err;
+       }
 
+       return 0;
+err:
+       platform_device_put(smdk_snd_wm9713_device);
        return ret;
 }
 
 static void __exit smdk_exit(void)
 {
        platform_device_unregister(smdk_snd_ac97_device);
+       platform_device_unregister(smdk_snd_wm9713_device);
 }
 
 module_init(smdk_init);