summaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-06-19 10:16:10 +0900
committerMark Brown <broonie@kernel.org>2019-06-19 12:49:42 +0100
commitced5b08020cdd4e2bed194dc35dba504221006ae (patch)
tree6bf7a1b3a6c952339a1b8bc681bba8d1731c2c0a /sound/soc/atmel
parentbfc7938e58142a583a8141f55e453fa1bb68439d (diff)
downloadlinux-ced5b08020cdd4e2bed194dc35dba504221006ae.tar.bz2
ASoC: atmel: sam9x5_wm8731: 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>
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/sam9x5_wm8731.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index 36917acc161f..8e8390d6b778 100644
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -93,7 +93,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
card = devm_kzalloc(&pdev->dev, sizeof(*card), GFP_KERNEL);
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
dai = devm_kzalloc(&pdev->dev, sizeof(*dai), GFP_KERNEL);
- comp = devm_kzalloc(&pdev->dev, 3 * sizeof(*comp), GFP_KERNEL);
+ comp = devm_kzalloc(&pdev->dev, 2 * sizeof(*comp), GFP_KERNEL);
if (!dai || !card || !priv || !comp) {
ret = -ENOMEM;
goto out;
@@ -112,8 +112,6 @@ static int sam9x5_wm8731_driver_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 PCM";
@@ -150,7 +148,6 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
goto out;
}
dai->cpus->of_node = cpu_np;
- dai->platforms->of_node = cpu_np;
priv->ssc_id = of_alias_get_id(cpu_np, "ssc");