ASoC: samsung: tm2_wm5110: don't select unnecessary Platform

ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index c091033d17ad154bf4a17de5bfa7685a9efd5794..a80781031f62f5dbfc9cc217324418fe58cb74e1 100644 (file)
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -429,21 +429,17 @@ static struct snd_soc_dai_driver tm2_ext_dai[] = {
 
 SND_SOC_DAILINK_DEFS(aif1,
        DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif1")));
 
 SND_SOC_DAILINK_DEFS(voice,
        DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif2")));
 
 SND_SOC_DAILINK_DEFS(bt,
        DAILINK_COMP_ARRAY(COMP_CPU(SAMSUNG_I2S_DAI)),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm5110-aif3")));
 
 SND_SOC_DAILINK_DEFS(hdmi,
-       DAILINK_COMP_ARRAY(COMP_EMPTY()),
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
        DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
@@ -576,14 +572,12 @@ static int tm2_probe(struct platform_device *pdev)
                unsigned int dai_index = 0; /* WM5110 */
 
                dai_link->cpus->name = NULL;
-               dai_link->platforms->name = NULL;
 
                if (num_codecs > 1 && i == card->num_links - 1)
                        dai_index = 1; /* HDMI */
 
                dai_link->codecs->of_node = codec_dai_node[dai_index];
                dai_link->cpus->of_node = cpu_dai_node[dai_index];
-               dai_link->platforms->of_node = cpu_dai_node[dai_index];
        }
 
        if (num_codecs > 1) {