diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-08-13 12:58:37 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-08-17 15:42:58 +0100 |
| commit | 1e6444271c667d56f3a793cfc295b72a1f8007da (patch) | |
| tree | 7a257ad83f68022c879eaf2c2e6d5dd91294e657 /sound/soc/intel/boards/bdw-rt5677.c | |
| parent | ASoC: SOF: Intel: hda-codec: move variable used conditionally (diff) | |
| download | linux-dev-1e6444271c667d56f3a793cfc295b72a1f8007da.tar.xz linux-dev-1e6444271c667d56f3a793cfc295b72a1f8007da.zip | |
ASoC: Intel: rename shadowed variable for all broadwell boards
Fix cppcheck warnings:
sound/soc/intel/boards/bdw-rt5650.c:91:23: style: Local variable
'channels' shadows outer variable [shadowVariable]
sound/soc/intel/boards/bdw-rt5677.c:144:23: style: Local variable
'channels' shadows outer variable [shadowVariable]
sound/soc/intel/boards/broadwell.c:91:23: style: Local variable
'channels' shadows outer variable [shadowVariable]
This was fixed earlier in other machine drivers but keeps coming back
with copy/paste.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200813175839.59422-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/bdw-rt5677.c')
| -rw-r--r-- | sound/soc/intel/boards/bdw-rt5677.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 86e427e3822f..297871bcaf5d 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -140,13 +140,13 @@ static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params) { struct snd_interval *rate = hw_param_interval(params, - SNDRV_PCM_HW_PARAM_RATE); - struct snd_interval *channels = hw_param_interval(params, - SNDRV_PCM_HW_PARAM_CHANNELS); + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *chan = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); /* The ADSP will covert the FE rate to 48k, stereo */ rate->min = rate->max = 48000; - channels->min = channels->max = 2; + chan->min = chan->max = 2; /* set SSP0 to 16 bit */ params_set_format(params, SNDRV_PCM_FORMAT_S16_LE); |