The patch
ASoC: tlv320aic32x4: Remove set but not used variable 'mclk_rate'
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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 83b4f50ca2b2e93346195b51f58e8089f9f35c0b Mon Sep 17 00:00:00 2001
From: YueHaibing yuehaibing@huawei.com Date: Wed, 17 Apr 2019 23:01:57 +0800 Subject: [PATCH] ASoC: tlv320aic32x4: Remove set but not used variable 'mclk_rate'
Fixes gcc '-Wunused-but-set-variable' warning:
sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_setup_clocks': sound/soc/codecs/tlv320aic32x4.c:669:16: warning: variable 'mclk_rate' set but not used [-Wunused-but-set-variable]
It is not used since introduction in commit 96c3bb00239d ("ASoC: tlv320aic32x4: Dynamically Determine Clocking")
Signed-off-by: YueHaibing yuehaibing@huawei.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/tlv320aic32x4.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 6edee05ff9f0..83608f386aef 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -684,9 +684,8 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component, u8 madc, nadc, mdac, ndac, max_nadc, min_mdac, max_ndac; u8 dosr_increment; u16 max_dosr, min_dosr; - unsigned long mclk_rate, adc_clock_rate, dac_clock_rate; + unsigned long adc_clock_rate, dac_clock_rate; int ret; - struct clk *mclk;
struct clk_bulk_data clocks[] = { { .id = "pll" }, @@ -700,9 +699,6 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component, if (ret) return ret;
- mclk = clk_get_parent(clocks[1].clk); - mclk_rate = clk_get_rate(mclk); - if (sample_rate <= 48000) { aosr = 128; adc_resource_class = 6;