Unverified Commit 1a29c760 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: kbl_da7219_max98927: rename shadowed variable 



Fix cppcheck warning:

[sound/soc/intel/boards/kbl_da7219_max98927.c:432] ->
[sound/soc/intel/boards/kbl_da7219_max98927.c:282]: (style) Local
variable 'channels' shadows outer variable

[sound/soc/intel/boards/kbl_da7219_max98927.c:432] ->
[sound/soc/intel/boards/kbl_da7219_max98927.c:494]: (style) Local
variable 'channels' shadows outer variable

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200113210428.27457-8-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2b66c70f

sound/soc/intel/boards/kbl_da7219_max98927.c

+6 −6
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int kabylake_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);

	struct snd_soc_dpcm *dpcm = container_of(
@@ -298,7 +298,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, 
		!strcmp(rtd->card->name, "kblmax98373")) {

		/* 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);
@@ -313,7 +313,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, 
	    !strcmp(fe_dai_link->name, "Kbl Audio Headset Playback") ||

	    !strcmp(fe_dai_link->name, "Kbl Audio Capture Port")) {

		rate->min = rate->max = 48000;

		channels->min = channels->max = 2;

		chan->min = chan->max = 2;

		snd_mask_none(fmt);

		snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S24_LE);

	}
@@ -494,7 +494,7 @@ static const struct snd_soc_ops kabylake_da7219_fe_ops = { 
static int kabylake_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);



	/*
@@ -502,9 +502,9 @@ static int kabylake_dmic_fixup(struct snd_soc_pcm_runtime *rtd, 
	 */



	if (params_channels(params) == 2)

		channels->min = channels->max = 2;

		chan->min = chan->max = 2;

	else

		channels->min = channels->max = 4;

		chan->min = chan->max = 4;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE