Applied "ASoC: nau8540: remove redundant variable osrate" to the asoc tree

Message ID
State New
Headers show
  • Applied "ASoC: nau8540: remove redundant variable osrate" to the asoc tree
Related show

Commit Message

Mark Brown Aug. 1, 2018, 11:17 a.m.
The patch

   ASoC: nau8540: remove redundant variable osrate

has been applied to the asoc tree at 

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.


From d101f9b96ee08f0454989bc3adb10e6cf7f3f953 Mon Sep 17 00:00:00 2001
From: Colin Ian King <>

Date: Wed, 1 Aug 2018 11:47:39 +0100
Subject: [PATCH] ASoC: nau8540: remove redundant variable osrate

Variable osrate is being assigned but is never used hence it is
redundant and can be removed.

Cleans up clang warning:
warning: variable 'osrate' set but not used [-Wunused-but-set-variable]

Signed-off-by: Colin Ian King <>

Signed-off-by: Mark Brown <>

 sound/soc/codecs/nau8540.c | 3 ---
 1 file changed, 3 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/codecs/nau8540.c b/sound/soc/codecs/nau8540.c
index 17104f8dc1a9..e3c8cd17daf2 100644
--- a/sound/soc/codecs/nau8540.c
+++ b/sound/soc/codecs/nau8540.c
@@ -362,11 +362,8 @@  static const struct snd_soc_dapm_route nau8540_dapm_routes[] = {
 static int nau8540_clock_check(struct nau8540 *nau8540, int rate, int osr)
-	int osrate;
 	if (osr >= ARRAY_SIZE(osr_adc_sel))
 		return -EINVAL;
-	osrate = osr_adc_sel[osr].osr;
 	if (rate * osr > CLK_ADC_MAX) {
 		dev_err(nau8540->dev, "exceed the maximum frequency of CLK_ADC\n");