Unverified Commit aa560f5e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o7ladgn9.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3c8b5861

sound/soc/fsl/imx-card.c

+3 −11
Original line number Diff line number Diff line
@@ -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);

sound/soc/fsl/imx-rpmsg.c

+1 −2
Original line number Diff line number Diff line
@@ -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;