ASoC: atmel: sam9x5_wm8731: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:16:10 +0000 (10:16 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:49:42 +0000 (12:49 +0100)
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>
sound/soc/atmel/sam9x5_wm8731.c

index 36917acc161f1752fbfaf498bad1adff1e21d05d..8e8390d6b778993ec24ceb6923ed6a2b6de2b604 100644 (file)
@@ -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");