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

Unverified Commit 22d251a5 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: use i on snd_soc_resume() 



This patch uses "int i" instead of "int j" on snd_soc_resume(),
and moves struct snd_soc_dai *codec_dai to top of this function.
This is cleanup and prepare for Multi CPU support

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

sound/soc/soc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -687,6 +687,8 @@ int snd_soc_resume(struct device *dev) 
	struct snd_soc_card *card = dev_get_drvdata(dev);

	bool bus_control = false;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai *codec_dai;

	int i;



	/* If the card is not initialized yet there is nothing to do */

	if (!card->instantiated)
@@ -694,14 +696,12 @@ int snd_soc_resume(struct device *dev) 


	/* activate pins from sleep state */

	for_each_card_rtds(card, rtd) {

		struct snd_soc_dai *codec_dai;

		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

		int j;



		if (cpu_dai->active)

			pinctrl_pm_select_default_state(cpu_dai->dev);



		for_each_rtd_codec_dai(rtd, j, codec_dai) {

		for_each_rtd_codec_dai(rtd, i, codec_dai) {

			if (codec_dai->active)

				pinctrl_pm_select_default_state(codec_dai->dev);

		}