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

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


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

sound/soc/generic/simple-card-utils.c

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

sound/soc/generic/simple-card.c

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