From d815e0f08fdd6259c9fff9eb4dc1834454526e98 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 19 Jun 2019 10:18:09 +0900 Subject: [PATCH] ASoC: samsung: smdk_wm8994: 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 Signed-off-by: Mark Brown --- sound/soc/samsung/smdk_wm8994.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 28f8be000aa1..99aa1620a17d 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c @@ -102,13 +102,11 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd) SND_SOC_DAILINK_DEFS(aif1, DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s.0")), - DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s.0"))); + DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1"))); SND_SOC_DAILINK_DEFS(fifo_tx, DAILINK_COMP_ARRAY(COMP_CPU("samsung-i2s-sec")), - DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("samsung-i2s-sec"))); + DAILINK_COMP_ARRAY(COMP_CODEC("wm8994-codec", "wm8994-aif1"))); static struct snd_soc_dai_link smdk_dai[] = { { /* Primary DAI i/f */ @@ -165,9 +163,6 @@ static int smdk_audio_probe(struct platform_device *pdev) "Property 'samsung,i2s-controller' missing or invalid\n"); ret = -EINVAL; } - - smdk_dai[0].platforms->name = NULL; - smdk_dai[0].platforms->of_node = smdk_dai[0].cpus->of_node; } id = of_match_device(of_match_ptr(samsung_wm8994_of_match), &pdev->dev); -- 2.30.2