ASoC: fsl: 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/87o7ladgn9.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index 6f3b142..356a0bc 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -551,10 +551,10 @@ static int imx_card_parse_of(struct imx_card_data *data)
                        goto err;
                }
 
-               ret = of_parse_phandle_with_args(cpu, "sound-dai",
-                                                "#sound-dai-cells", 0, &args);
+               ret = snd_soc_of_get_dlc(cpu, &args, link->cpus, 0);
                if (ret) {
-                       dev_err(card->dev, "%s: error getting cpu phandle\n", link->name);
+                       dev_err_probe(card->dev, ret,
+                                     "%s: error getting cpu dai info\n", link->name);
                        goto err;
                }
 
@@ -582,17 +582,9 @@ static int imx_card_parse_of(struct imx_card_data *data)
                        }
                }
 
-               link->cpus->of_node = args.np;
                link->platforms->of_node = link->cpus->of_node;
                link->id = args.args[0];
 
-               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name, 0);
-               if (ret) {
-                       dev_err_probe(card->dev, ret,
-                                     "%s: error getting cpu dai name\n", link->name);
-                       goto err;
-               }
-
                codec = of_get_child_by_name(np, "codec");
                if (codec) {
                        ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);

diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c
index 93fc976..3c7b95d 100644 (file)
--- a/sound/soc/fsl/imx-rpmsg.c
+++ b/sound/soc/fsl/imx-rpmsg.c
@@ -96,8 +96,7 @@ static int imx_rpmsg_probe(struct platform_device *pdev)
        } else {
                struct clk *clk;
 
-               data->dai.codecs->of_node = args.np;
-               ret = snd_soc_get_dai_name(&args, &data->dai.codecs->dai_name);
+               ret = snd_soc_get_dlc(&args, data->dai.codecs);
                if (ret) {
                        dev_err(&pdev->dev, "Unable to get codec_dai_name\n");
                        goto fail;