ASoC: simple-card.c: use snd_soc_{of_}get_dlc()

Current ASoC has snd_soc_{of_}get_dai_name() to get DAI name
for dlc (snd_soc_dai_link_component).
But we now can use snd_soc_{of_}get_dlc() for it. Let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87fs6mdgmc.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 3af056026fa25f56d1306f31f9c53c36609937e2..3019626b05927dc9209dd10c1fe4ad7f149d17d3 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -1103,14 +1103,12 @@ int asoc_graph_parse_dai(struct device_node *ep,
         * 2) user need to rebind Sound Card everytime
         *    if he unbinded CPU or Codec.
         */
-       ret = snd_soc_get_dai_name(&args, &dlc->dai_name);
+       ret = snd_soc_get_dlc(&args, dlc);
        if (ret < 0) {
                of_node_put(node);
                return ret;
        }
 
-       dlc->of_node = node;
-
        if (is_single_link)
                *is_single_link = of_graph_get_endpoint_count(node) == 1;
 

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 5b59198a0384626b7e07035430b467c88aaaceb8..0745bf6a09aa0a20457f21ff54bad0af39de395b 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -89,12 +89,10 @@ static int asoc_simple_parse_dai(struct device_node *node,
         * 2) user need to rebind Sound Card everytime
         *    if he unbinded CPU or Codec.
         */
-       ret = snd_soc_of_get_dai_name(node, &dlc->dai_name, 0);
+       ret = snd_soc_get_dlc(&args, dlc);
        if (ret < 0)
                return ret;
 
-       dlc->of_node = args.np;
-
        if (is_single_link)
                *is_single_link = !args.args_count;