ASoC: samsung: use snd_soc_{of_}get_dlc()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 20 Jun 2023 02:14:35 +0000 (02:14 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 20 Jun 2023 11:49:26 +0000 (12:49 +0100)
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.

- note: need deep check

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

index fd95a79..a544259 100644 (file)
@@ -205,7 +205,6 @@ static int odroid_audio_probe(struct platform_device *pdev)
        struct snd_soc_card *card;
        struct snd_soc_dai_link *link, *codec_link;
        int num_pcms, ret, i;
-       struct of_phandle_args args = {};
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -260,20 +259,7 @@ static int odroid_audio_probe(struct platform_device *pdev)
        }
 
        for (i = 0; i < num_pcms; i++, link += 2) {
-               ret = of_parse_phandle_with_args(cpu, "sound-dai",
-                                                "#sound-dai-cells", i, &args);
-               if (ret < 0)
-                       break;
-
-               if (!args.np) {
-                       dev_err(dev, "sound-dai property parse error: %d\n", ret);
-                       ret = -EINVAL;
-                       break;
-               }
-
-               ret = snd_soc_get_dai_name(&args, &link->cpus->dai_name);
-               of_node_put(args.np);
-
+               ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name, i);
                if (ret < 0)
                        break;
        }