ASoC: tas571x: Fix -Wunused-const-variable
Subsystems (3)
PATCH 1/1 ASoC: tas571x: Fix -Wunused-const-variable
Clang produces the following warning
sound/soc/codecs/tas571x.c:666:38: warning: unused variable 'tas5721_controls' [-Wunused-const-variable]
In the chip struct definition tas5711_controls is used rather than tac5712_controls. Looks like a typo was made in the original commit.
Since tac5711_controls is identical to tas5721_controls we can just swap them
--- sound/soc/codecs/tas571x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/tas571x.c +2 -2
@@ -721,8 +721,8 @@ static const struct regmap_config tas5721_regmap_config = {static const struct tas571x_chip tas5721_chip = { .supply_names = tas5721_supply_names, .num_supply_names =ARRAY_SIZE (tas5721_supply_names), - .controls = tas5711_controls, - .num_controls =ARRAY_SIZE (tas5711_controls), + .controls = tas5721_controls, + .num_controls =ARRAY_SIZE (tas5721_controls), .regmap_config = &tas5721_regmap_config, .vol_reg_size =1 , };
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
Quoted 2 lines · Nathan Huckleberry' via Clang Built Linux
Since
tac5711_controlsis identical totas5721_controlswe can just swap them
380 static const struct snd_kcontrol_new tas5711_controls[] = {
381 SOC_SINGLE_TLV("Master Volume",
382 TAS571X_MVOL_REG,
383 0, 0xff, 1, tas5711_volume_tlv),
384 SOC_DOUBLE_R_TLV("Speaker Volume",
385 TAS571X_CH1_VOL_REG,
386 TAS571X_CH2_VOL_REG,
387 0, 0xff, 1, tas5711_volume_tlv),
388 SOC_DOUBLE("Speaker Switch",
389 TAS571X_SOFT_MUTE_REG,
390 TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,
391 1, 1),392 };
vs
666 static const struct snd_kcontrol_new tas5721_controls[] = {
667 SOC_SINGLE_TLV("Master Volume",
668 TAS571X_MVOL_REG,
669 0, 0xff, 1, tas5711_volume_tlv),
670 SOC_DOUBLE_R_TLV("Speaker Volume",
671 TAS571X_CH1_VOL_REG,
672 TAS571X_CH2_VOL_REG,
673 0, 0xff, 1, tas5711_volume_tlv),
674 SOC_DOUBLE("Speaker Switch",
675 TAS571X_SOFT_MUTE_REG,
676 TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,
677 1, 1),678 };
Thanks for the patch!
Alternatively, we could make 2 variables w/ the same variable, 1 variable. It seems there's at least 4 _control variables:tas5711_controlstas5707_controlstas5717_controlstas5721_controls
so maybe tas57X1_controls would be appropriate? Not sure if the maintainers have a preference here?
(Looks like L669 also refers to tas5711, but it seems there no tas5721 equivalent for _volume_tlv.)
Signature · 2 lines
Thanks, ~Nick Desaulniers
Mark Brown
maintainerApplied "ASoC: tas571x: Fix -Wunused-const-variable" to the asoc tree
In reply to Nathan HuckleberryThe patch
ASoC: tas571x: Fix -Wunused-const-variable
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
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
Quoted 1 line
From
2f7e015c1f20cfdbe97df25868abbfa8b7514778Mon Sep 17 00:00:00 2001
From: Nathan Huckleberry <[email protected]>
Date: Wed, 12 Jun 2019 16:25:02 -0700
Subject: [PATCH] ASoC: tas571x: Fix -Wunused-const-variable
Clang produces the following warning
sound/soc/codecs/tas571x.c:666:38: warning: unused variable 'tas5721_controls' [-Wunused-const-variable]
In the chip struct definition tas5711_controls is used rather than tac5712_controls. Looks like a typo was made in the original commit.
Since tac5711_controls is identical to tas5721_controls we can just swap them
--- sound/soc/codecs/tas571x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/tas571x.c +2 -2
@@ -725,8 +725,8 @@ static const struct regmap_config tas5721_regmap_config = {static const struct tas571x_chip tas5721_chip = { .supply_names = tas5721_supply_names, .num_supply_names =ARRAY_SIZE (tas5721_supply_names), - .controls = tas5711_controls, - .num_controls =ARRAY_SIZE (tas5711_controls), + .controls = tas5721_controls, + .num_controls =ARRAY_SIZE (tas5721_controls), .regmap_config = &tas5721_regmap_config, .vol_reg_size =1 , };
Signature · 1 line
2.20.1