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

ASoC: meson: 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/87legedgmy.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/meson/axg-card.c

+1 −2
Original line number Diff line number Diff line
@@ -319,8 +319,7 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, 
	dai_link->cpus = cpu;

	dai_link->num_cpus = 1;



	ret = meson_card_parse_dai(card, np, &dai_link->cpus->of_node,

				   &dai_link->cpus->dai_name);

	ret = meson_card_parse_dai(card, np, dai_link->cpus);

	if (ret)

		return ret;

sound/soc/meson/gx-card.c

+1 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, 
	dai_link->cpus = cpu;

	dai_link->num_cpus = 1;



	ret = meson_card_parse_dai(card, np, &dai_link->cpus->of_node,

				   &dai_link->cpus->dai_name);

	ret = meson_card_parse_dai(card, np, dai_link->cpus);

	if (ret)

		return ret;

sound/soc/meson/meson-card-utils.c

+5 −11
Original line number Diff line number Diff line
@@ -74,23 +74,18 @@ EXPORT_SYMBOL_GPL(meson_card_reallocate_links); 


int meson_card_parse_dai(struct snd_soc_card *card,

			 struct device_node *node,

			 struct device_node **dai_of_node,

			 const char **dai_name)

			 struct snd_soc_dai_link_component *dlc)

{

	struct of_phandle_args args;

	int ret;



	if (!dai_name || !dai_of_node || !node)

	if (!dlc || !node)

		return -EINVAL;



	ret = of_parse_phandle_with_args(node, "sound-dai",

					 "#sound-dai-cells", 0, &args);

	ret = snd_soc_of_get_dlc(node, NULL, dlc, 0);

	if (ret)

		return dev_err_probe(card->dev, ret, "can't parse dai\n");



	*dai_of_node = args.np;



	return snd_soc_get_dai_name(&args, dai_name);

	return ret;

}

EXPORT_SYMBOL_GPL(meson_card_parse_dai);
@@ -160,8 +155,7 @@ int meson_card_set_be_link(struct snd_soc_card *card, 
	link->num_codecs = num_codecs;



	for_each_child_of_node(node, np) {

		ret = meson_card_parse_dai(card, np, &codec->of_node,

					   &codec->dai_name);

		ret = meson_card_parse_dai(card, np, codec);

		if (ret) {

			of_node_put(np);

			return ret;

sound/soc/meson/meson-card.h

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ int meson_card_reallocate_links(struct snd_soc_card *card, 
				unsigned int num_links);

int meson_card_parse_dai(struct snd_soc_card *card,

			 struct device_node *node,

			 struct device_node **dai_of_node,

			 const char **dai_name);

			 struct snd_soc_dai_link_component *dlc);

int meson_card_set_be_link(struct snd_soc_card *card,

			   struct snd_soc_dai_link *link,

			   struct device_node *node);