Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ASoC: add for_each_link_codecs() macro 



ALSA SoC snd_soc_dai_link has snd_soc_dai_link_component array
for codecs.
To be more readable code, this patch adds
new for_each_link_codecs() macro, and replace existing code to it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 18d545bb

include/sound/soc.h

+4 −0
Original line number Diff line number Diff line
@@ -978,6 +978,10 @@ struct snd_soc_dai_link { 
	struct list_head list; /* DAI link list of the soc card */

	struct snd_soc_dobj dobj; /* For topology */

};

#define for_each_link_codecs(link, i, codec)				\

	for ((i) = 0;							\

	     ((i) < link->num_codecs) && ((codec) = &link->codecs[i]);	\

	     (i)++)



struct snd_soc_codec_conf {

	/*

sound/soc/meson/axg-card.c

+3 −2
Original line number Diff line number Diff line
@@ -97,14 +97,15 @@ static void axg_card_clean_references(struct axg_card *priv) 
{

	struct snd_soc_card *card = &priv->card;

	struct snd_soc_dai_link *link;

	struct snd_soc_dai_link_component *codec;

	int i, j;



	if (card->dai_link) {

		for (i = 0; i < card->num_links; i++) {

			link = &card->dai_link[i];

			of_node_put(link->cpu_of_node);

			for (j = 0; j < link->num_codecs; j++)

				of_node_put(link->codecs[j].of_node);

			for_each_link_codecs(link, j, codec)

				of_node_put(codec->of_node);

		}

	}

sound/soc/soc-core.c

+8 −9
Original line number Diff line number Diff line
@@ -1071,6 +1071,7 @@ static int soc_init_dai_link(struct snd_soc_card *card, 
				   struct snd_soc_dai_link *link)

{

	int i, ret;

	struct snd_soc_dai_link_component *codec;



	ret = snd_soc_init_platform(card, link);

	if (ret) {
@@ -1084,19 +1085,19 @@ static int soc_init_dai_link(struct snd_soc_card *card, 
		return ret;

	}



	for (i = 0; i < link->num_codecs; i++) {

	for_each_link_codecs(link, i, codec) {

		/*

		 * Codec must be specified by 1 of name or OF node,

		 * not both or neither.

		 */

		if (!!link->codecs[i].name ==

		    !!link->codecs[i].of_node) {

		if (!!codec->name ==

		    !!codec->of_node) {

			dev_err(card->dev, "ASoC: Neither/both codec name/of_node are set for %s\n",

				link->name);

			return -EINVAL;

		}

		/* Codec DAI name must be specified */

		if (!link->codecs[i].dai_name) {

		if (!codec->dai_name) {

			dev_err(card->dev, "ASoC: codec_dai_name not set for %s\n",

				link->name);

			return -EINVAL;
@@ -3796,10 +3797,10 @@ EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_name); 
 */

void snd_soc_of_put_dai_link_codecs(struct snd_soc_dai_link *dai_link)

{

	struct snd_soc_dai_link_component *component = dai_link->codecs;

	struct snd_soc_dai_link_component *component;

	int index;



	for (index = 0; index < dai_link->num_codecs; index++, component++) {

	for_each_link_codecs(dai_link, index, component) {

		if (!component->of_node)

			break;

		of_node_put(component->of_node);
@@ -3851,9 +3852,7 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev, 
	dai_link->num_codecs = num_codecs;



	/* Parse the list */

	for (index = 0, component = dai_link->codecs;

	     index < dai_link->num_codecs;

	     index++, component++) {

	for_each_link_codecs(dai_link, index, component) {

		ret = of_parse_phandle_with_args(of_node, name,

						 "#sound-dai-cells",

						  index, &args);