aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 10:15:05 +0900
committerMark Brown <broonie@kernel.org>2019-06-19 12:49:02 +0100
commit318ebbe8060d9664370c844029246f0588263fe4 (patch)
tree0d5aa3df5df72cec7cd4cb7a59525f59e3e297fb
parentASoC: atmel: atmel_wm8904: don't select unnecessary Platform (diff)
ASoC: atmel: mikroe-proto: 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>
-rw-r--r--sound/soc/atmel/mikroe-proto.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 255168a9df5b..5335ca0ee086 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -88,8 +88,8 @@ static int snd_proto_probe(struct platform_device *pdev)
if (!dai)
return -ENOMEM;
- /* for cpus/codecs/platforms */
- comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
+ /* for cpus/codecs */
+ comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
if (!comp)
return -ENOMEM;
@@ -100,8 +100,6 @@ static int snd_proto_probe(struct platform_device *pdev)
dai->num_cpus = 1;
dai->codecs = &comp[1];
dai->num_codecs = 1;
- dai->platforms = &comp[2];
- dai->num_platforms = 1;
dai->name = "WM8731";
dai->stream_name = "WM8731 HiFi";
@@ -121,7 +119,6 @@ static int snd_proto_probe(struct platform_device *pdev)
return -EINVAL;
}
dai->cpus->of_node = cpu_np;
- dai->platforms->of_node = cpu_np;
dai_fmt = snd_soc_of_parse_daifmt(np, NULL,
&bitclkmaster, &framemaster);