diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-05-13 16:06:07 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-13 12:43:46 +0100 |
| commit | 22d251a5964780452aed378a143816fbf2d4201d (patch) | |
| tree | d51730befab2afd21594d8ae955b0ef3f7881a93 /sound | |
| parent | bcd9382288af236321c83d27b0db196bf8814559 (diff) | |
| download | linux-stable-22d251a5964780452aed378a143816fbf2d4201d.tar.gz linux-stable-22d251a5964780452aed378a143816fbf2d4201d.tar.bz2 linux-stable-22d251a5964780452aed378a143816fbf2d4201d.zip | |
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2403bec2fccf..0d9b02075050 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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); } |