diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-01-13 15:04:19 -0600 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-01-14 15:28:58 +0000 |
| commit | 74e7c6b0030c36a9e9e3c8da4d3b08160b5dda4d (patch) | |
| tree | 90dde57d71bf4a5b8740c873b759cc61c6998914 | |
| parent | ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization (diff) | |
| download | linux-dev-74e7c6b0030c36a9e9e3c8da4d3b08160b5dda4d.tar.xz linux-dev-74e7c6b0030c36a9e9e3c8da4d3b08160b5dda4d.zip | |
ASoC: Intel: kbl_rt5660: rename shadowed variable
Fix cppcheck warning:
[sound/soc/intel/boards/kbl_rt5660.c:282] ->
[sound/soc/intel/boards/kbl_rt5660.c:141]: (style) Local variable
'channels' shadows outer variable
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200113210428.27457-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/boards/kbl_rt5660.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 74fe1f3a5479..e23dea9ab79a 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -138,13 +138,13 @@ static int kabylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, { struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE); - struct snd_interval *channels = hw_param_interval(params, + struct snd_interval *chan = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); /* The ADSP will convert the FE rate to 48k, stereo */ rate->min = rate->max = 48000; - channels->min = channels->max = DUAL_CHANNEL; + chan->min = chan->max = DUAL_CHANNEL; /* set SSP0 to 24 bit */ snd_mask_none(fmt); |