From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
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@xxxxxxxxxxx>
---
sound/soc/tegra/tegra_sgtl5000.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index e13b81d..07504a2 100644
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -83,8 +83,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",
@@ -146,8 +145,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;
@@ -166,7 +163,6 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
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;
@@ -186,7 +182,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;
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
