OSDN Git Service

ASoC: tegra: tegra_sgtl5000: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:18:48 +0000 (10:18 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:56:34 +0000 (12:56 +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/tegra/tegra_sgtl5000.c

index c5d45a6..2a9e1ce 100644 (file)
@@ -94,8 +94,7 @@ static const struct snd_soc_dapm_widget tegra_sgtl5000_dapm_widgets[] = {
 
 SND_SOC_DAILINK_DEFS(hifi,
        DAILINK_COMP_ARRAY(COMP_EMPTY()),
-       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sgtl5000")),
-       DAILINK_COMP_ARRAY(COMP_EMPTY()));
+       DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sgtl5000")));
 
 static struct snd_soc_dai_link tegra_sgtl5000_dai = {
        .name = "sgtl5000",
@@ -157,8 +156,6 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
                goto err_put_codec_of_node;
        }
 
-       tegra_sgtl5000_dai.platforms->of_node = tegra_sgtl5000_dai.cpus->of_node;
-
        ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
        if (ret)
                goto err_put_cpu_of_node;
@@ -177,7 +174,6 @@ err_fini_utils:
 err_put_cpu_of_node:
        of_node_put(tegra_sgtl5000_dai.cpus->of_node);
        tegra_sgtl5000_dai.cpus->of_node = NULL;
-       tegra_sgtl5000_dai.platforms->of_node = NULL;
 err_put_codec_of_node:
        of_node_put(tegra_sgtl5000_dai.codecs->of_node);
        tegra_sgtl5000_dai.codecs->of_node = NULL;
@@ -197,7 +193,6 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)
 
        of_node_put(tegra_sgtl5000_dai.cpus->of_node);
        tegra_sgtl5000_dai.cpus->of_node = NULL;
-       tegra_sgtl5000_dai.platforms->of_node = NULL;
        of_node_put(tegra_sgtl5000_dai.codecs->of_node);
        tegra_sgtl5000_dai.codecs->of_node = NULL;