ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable (83fa6775) · Commits · 戴 / test

[sound/soc/intel/boards/glk_rt5682_max98357a.c:252] -> [sound/soc/intel/boards/glk_rt5682_max98357a.c:121]: (style) Local variable 'channels' shadows outer variable [sound/soc/intel/boards/glk_rt5682_max98357a.c:252] -> [sound/soc/intel/boards/glk_rt5682_max98357a.c:275]: (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-4-pierre-louis.bossart@linux.intel.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/intel/boards/glk_rt5682_max98357a.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -118,13 +118,13 @@ static int geminilake_ssp_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 SSP to 24 bit */
		snd_mask_none(fmt);
		@@ -272,13 +272,13 @@ static struct snd_pcm_hw_constraint_list constraints_channels_quad = {
		static int geminilake_dmic_fixup(struct snd_soc_pcm_runtime *rtd,
		struct snd_pcm_hw_params *params)
		{
		struct snd_interval *channels = hw_param_interval(params,
		struct snd_interval *chan = hw_param_interval(params,
		SNDRV_PCM_HW_PARAM_CHANNELS);

		/*
		* set BE channel constraint as user FE channels
		*/
		channels->min = channels->max = 4;
		chan->min = chan->max = 4;

		return 0;
		}

Admin message