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

ASoC: add for_each_card_prelinks() macro 



To be more readable code, this patch adds
new for_each_card_prelinks() 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 6d11b128

include/sound/soc.h

+4 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,10 @@ struct snd_soc_card { 


	void *drvdata;

};

#define for_each_card_prelinks(card, i, link)				\

	for ((i) = 0;							\

	     ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \

	     (i)++)



/* SoC machine DAI configuration, glues a codec and cpu DAI together */

struct snd_soc_pcm_runtime {

sound/soc/fsl/pcm030-audio-fabric.c

+3 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static int pcm030_fabric_probe(struct platform_device *op) 
	struct device_node *platform_np;

	struct snd_soc_card *card = &pcm030_card;

	struct pcm030_audio_data *pdata;

	struct snd_soc_dai_link *dai_link;

	int ret;

	int i;
@@ -78,8 +79,8 @@ static int pcm030_fabric_probe(struct platform_device *op) 
		return -ENODEV;

	}



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

		card->dai_link[i].platform_of_node = platform_np;

	for_each_card_prelinks(card, i, dai_link)

		dai_link->platform_of_node = platform_np;



	ret = request_module("snd-soc-wm9712");

	if (ret)

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

+2 −4
Original line number Diff line number Diff line
@@ -404,11 +404,9 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_cpu); 
int asoc_simple_card_clean_reference(struct snd_soc_card *card)

{

	struct snd_soc_dai_link *dai_link;

	int num_links;

	int i;



	for (num_links = 0, dai_link = card->dai_link;

	     num_links < card->num_links;

	     num_links++, dai_link++) {

	for_each_card_prelinks(card, i, dai_link) {

		of_node_put(dai_link->cpu_of_node);

		of_node_put(dai_link->codecs->of_node);

	}

sound/soc/intel/boards/skl_hda_dsp_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static struct snd_soc_card hda_soc_card = { 
static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata)

{

	struct snd_soc_card *card = &hda_soc_card;

	struct snd_soc_dai_link *dai_link;

	u32 codec_count, codec_mask;

	int i, num_links, num_route;
@@ -125,8 +126,8 @@ static int skl_hda_fill_card_info(struct skl_machine_pdata *pdata) 
	card->num_links = num_links;

	card->num_dapm_routes = num_route;



	for (i = 0; i < num_links; i++)

		skl_hda_be_dai_links[i].platform_name = pdata->platform;

	for_each_card_prelinks(card, i, dai_link)

		dai_link->platform_name = pdata->platform;



	return 0;

}

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+7 −6
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
		devm_kzalloc(&pdev->dev, sizeof(struct mt2701_cs42448_private),

			     GFP_KERNEL);

	struct device *dev = &pdev->dev;

	struct snd_soc_dai_link *dai_link;



	if (!priv)

		return -ENOMEM;
@@ -309,10 +310,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "Property 'platform' missing or invalid\n");

		return -EINVAL;

	}

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

		if (mt2701_cs42448_dai_links[i].platform_name)

	for_each_card_prelinks(card, i, dai_link) {

		if (dai_links->platform_name)

			continue;

		mt2701_cs42448_dai_links[i].platform_of_node = platform_node;

		dai_links->platform_of_node = platform_node;

	}



	card->dev = dev;
@@ -324,10 +325,10 @@ static int mt2701_cs42448_machine_probe(struct platform_device *pdev) 
			"Property 'audio-codec' missing or invalid\n");

		return -EINVAL;

	}

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

		if (mt2701_cs42448_dai_links[i].codec_name)

	for_each_card_prelinks(card, i, dai_link) {

		if (dai_links->codec_name)

			continue;

		mt2701_cs42448_dai_links[i].codec_of_node = codec_node;

		dai_links->codec_of_node = codec_node;

	}



	codec_node_bt_mrg = of_parse_phandle(pdev->dev.of_node,