ASoC: multi-component - ASoC Multi-Component Support

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

diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c
index ffa954fe6931bea522fb02360b8f4877524884bb..abe64abe8c8423ad5f403532a9d40d8234d5b15b 100644 (file)
--- a/sound/soc/s3c24xx/ln2440sbc_alc650.c
+++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c
@@ -23,7 +23,6 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
-#include "../codecs/ac97.h"
 #include "s3c-dma.h"
 #include "s3c-ac97.h"
 
@@ -33,23 +32,19 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
 {
        .name = "AC97",
        .stream_name = "AC97 HiFi",
-       .cpu_dai = &s3c_ac97_dai[S3C_AC97_DAI_PCM],
-       .codec_dai = &ac97_dai,
+       .cpu_dai_name = "s3c-ac97",
+       .codec_dai_name = "ac97-hifi",
+       .codec_name = "ac97-codec",
+       .platform_name = "s3c24xx-pcm-audio",
 },
 };
 
 static struct snd_soc_card ln2440sbc = {
        .name = "LN2440SBC",
-       .platform = &s3c24xx_soc_platform,
        .dai_link = ln2440sbc_dai,
        .num_links = ARRAY_SIZE(ln2440sbc_dai),
 };
 
-static struct snd_soc_device ln2440sbc_snd_ac97_devdata = {
-       .card = &ln2440sbc,
-       .codec_dev = &soc_codec_dev_ac97,
-};
-
 static struct platform_device *ln2440sbc_snd_ac97_device;
 
 static int __init ln2440sbc_init(void)
@@ -60,9 +55,7 @@ static int __init ln2440sbc_init(void)
        if (!ln2440sbc_snd_ac97_device)
                return -ENOMEM;
 
-       platform_set_drvdata(ln2440sbc_snd_ac97_device,
-                               &ln2440sbc_snd_ac97_devdata);
-       ln2440sbc_snd_ac97_devdata.dev = &ln2440sbc_snd_ac97_device->dev;
+       platform_set_drvdata(ln2440sbc_snd_ac97_device, &ln2440sbc);
        ret = platform_device_add(ln2440sbc_snd_ac97_device);
 
        if (ret)