From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [alsa-devel] [PATCH 07/18] ASoC: Intel: kbl_da7219_max98927: rename shadowed variable
Date: Mon, 13 Jan 2020 15:04:17 -0600 [thread overview]
Message-ID: <20200113210428.27457-8-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200113210428.27457-1-pierre-louis.bossart@linux.intel.com>
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/kbl_da7219_max98927.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c
index e8b2ec60fb03..f8cf5de5ba09 100644
--- a/sound/soc/intel/boards/kbl_da7219_max98927.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98927.c
@@ -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;
}
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2020-01-14 13:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 21:04 [alsa-devel] [PATCH 00/18] ASoC: Intel: remove compilation/static analysis warnings Pierre-Louis Bossart
2020-01-13 21:04 ` [alsa-devel] [PATCH 01/18] ASoC: Intel: bxt_da7219_max98357a: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: bxt_da7219_max98357a: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 02/18] ASoC: Intel: bxt_rt298: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: bxt_rt298: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 03/18] ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 04/18] ASoC: Intel: glk_rt5682_max98357a: removed unused variables Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: glk_rt5682_max98357a: removed unused variables" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 05/18] ASoC: Intel: kbl_da7219_max98357a: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_da7219_max98357a: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 06/18] ASoC: Intel: kbl_da7219_max98927: test return value on route add Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_da7219_max98927: test return value on route add" to the asoc tree Mark Brown
2020-01-13 21:04 ` Pierre-Louis Bossart [this message]
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_da7219_max98927: rename shadowed variable" " Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 08/18] ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 09/18] ASoC: Intel: kbl_rt5660: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_rt5660: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 10/18] ASoC: Intel: kbl_rt5663_max98927: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_rt5663_max98927: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 11/18] ASoC: Intel: kbl_rt5663_rt5514_max98927: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: kbl_rt5663_rt5514_max98927: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 12/18] ASOC: Intel: kbl_rt5663_rt5514_max98927: remove useless initialization Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASOC: Intel: kbl_rt5663_rt5514_max98927: remove useless initialization" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 13/18] ASoC: Intel: skl_nau88l25_max98357a: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: skl_nau88l25_max98357a: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 14/18] ASoC: Intel: skl_nau88l25_ssm4567: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: skl_nau88l25_ssm4567: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 15/18] ASoC: Intel: skl_rt286: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: skl_rt286: rename shadowed variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 16/18] ASoC: Intel: bytcht_es8316: removed unused variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: bytcht_es8316: removed unused variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 17/18] ASoC: Intel: bytcr_rt5640: remove unused variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: bytcr_rt5640: remove unused variable" to the asoc tree Mark Brown
2020-01-13 21:04 ` [alsa-devel] [PATCH 18/18] ASoC: Intel: bytcr_rt5651: remove unused variable Pierre-Louis Bossart
2020-01-14 16:09 ` [alsa-devel] Applied "ASoC: Intel: bytcr_rt5651: remove unused variable" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200113210428.27457-8-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).