Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: tiwai@suse.de, alsa-devel@alsa-project.org,
	Mark Brown <broonie@kernel.org>
Subject: [alsa-devel] Applied "ASoC: Intel: skl_rt286: rename shadowed variable" to the asoc tree
Date: Tue, 14 Jan 2020 16:09:08 +0000 (GMT)
Message-ID: <applied-20200113210428.27457-16-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200113210428.27457-16-pierre-louis.bossart@linux.intel.com>

The patch

   ASoC: Intel: skl_rt286: rename shadowed variable

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 0c7288f49135c27211c3a39e16788db41b22bf93 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Mon, 13 Jan 2020 15:04:25 -0600
Subject: [PATCH] ASoC: Intel: skl_rt286: rename shadowed variable

Fix cppcheck warning:

[sound/soc/intel/boards/skl_rt286.c:171] ->
[sound/soc/intel/boards/skl_rt286.c:214]: (style) Local variable
'channels' shadows outer variable

[sound/soc/intel/boards/skl_rt286.c:171] ->
[sound/soc/intel/boards/skl_rt286.c:250]: (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-16-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/intel/boards/skl_rt286.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
index 231349a47cc9..a9aec66a2351 100644
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
@@ -211,13 +211,13 @@ static int skylake_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 output is 48KHz, stereo, 16bits */
 	rate->min = rate->max = 48000;
-	channels->min = channels->max = 2;
+	chan->min = chan->max = 2;
 
 	/* set SSP0 to 24 bit */
 	snd_mask_none(fmt);
@@ -247,12 +247,12 @@ static const struct snd_soc_ops skylake_rt286_ops = {
 static int skylake_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);
 	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

  reply index

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 ` [alsa-devel] [PATCH 07/18] ASoC: Intel: kbl_da7219_max98927: rename shadowed variable Pierre-Louis Bossart
2020-01-14 16:09   ` [alsa-devel] Applied "ASoC: Intel: kbl_da7219_max98927: rename shadowed variable" to the asoc tree 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   ` Mark Brown [this message]
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 publically 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=applied-20200113210428.27457-16-pierre-louis.bossart@linux.intel.com \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=pierre-louis.bossart@linux.intel.com \
    --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

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git