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

ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() 



Current snd_soc_get_pcm_runtime() is finding rtd by checking dai_link
name. But, it is strange and waste of CPU power, because its user want
to get from rtd from dai_link, not from dai_link name.
This patch find rtd via dai_link pointer instead of its name.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87a781yq67.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static inline int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
void snd_soc_disconnect_sync(struct device *dev);



struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,

		const char *dai_link);

				struct snd_soc_dai_link *dai_link);



bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd);

void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);

sound/soc/fsl/fsl-asoc-card.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, 
	unsigned int pll_out;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	codec_dai = rtd->codec_dai;

	if (dapm->dev != codec_dai->dev)

		return 0;

sound/soc/pxa/mioa701_wm9713.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int rear_amp_event(struct snd_soc_dapm_widget *widget, 
	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_component *component;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	component = rtd->codec_dai->component;

	return rear_amp_power(component, SND_SOC_DAPM_EVENT_ON(event));

}

sound/soc/samsung/bells.c

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int bells_set_bias_level(struct snd_soc_card *card, 
	struct bells_drvdata *bells = card->drvdata;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	codec_dai = rtd->codec_dai;

	component = codec_dai->component;
@@ -105,7 +105,7 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, 
	struct bells_drvdata *bells = card->drvdata;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	codec_dai = rtd->codec_dai;

	component = codec_dai->component;
@@ -151,10 +151,10 @@ static int bells_late_probe(struct snd_soc_card *card) 
	struct snd_soc_dai *wm9081_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_AP_DSP].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_AP_DSP]);

	wm0010 = rtd->codec_dai->component;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_DSP_CODEC].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	component = rtd->codec_dai->component;

	aif1_dai = rtd->codec_dai;
@@ -194,7 +194,7 @@ static int bells_late_probe(struct snd_soc_card *card) 
		return ret;

	}



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_CODEC_CP].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_CP]);

	aif2_dai = rtd->cpu_dai;



	ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0);
@@ -206,7 +206,7 @@ static int bells_late_probe(struct snd_soc_card *card) 
	if (card->num_rtd == DAI_CODEC_SUB)

		return 0;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[DAI_CODEC_SUB].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_SUB]);

	aif3_dai = rtd->cpu_dai;

	wm9081_dai = rtd->codec_dai;

sound/soc/samsung/littlemill.c

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int littlemill_set_bias_level(struct snd_soc_card *card, 
	struct snd_soc_dai *aif1_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	aif1_dai = rtd->codec_dai;



	if (dapm->dev != aif1_dai->dev)
@@ -69,7 +69,7 @@ static int littlemill_set_bias_level_post(struct snd_soc_card *card, 
	struct snd_soc_dai *aif1_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	aif1_dai = rtd->codec_dai;



	if (dapm->dev != aif1_dai->dev)
@@ -180,7 +180,7 @@ static int bbclk_ev(struct snd_soc_dapm_widget *w, 
	struct snd_soc_dai *aif2_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);

	aif2_dai = rtd->cpu_dai;



	switch (event) {
@@ -263,11 +263,11 @@ static int littlemill_late_probe(struct snd_soc_card *card) 
	struct snd_soc_dai *aif2_dai;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	component = rtd->codec_dai->component;

	aif1_dai = rtd->codec_dai;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);

	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);

	aif2_dai = rtd->cpu_dai;



	ret = snd_soc_dai_set_sysclk(aif1_dai, WM8994_SYSCLK_MCLK2,