| Message ID | 20200324070615.16248-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6b877cf8bc98e6c574a6d763943c4a92592e431c |
| Headers | show |
| Series | [-next] ASoC: wm8974: remove unused variables | expand |
On Tue, Mar 24, 2020 at 03:06:15PM +0800, YueHaibing wrote: > sound/soc/codecs/wm8974.c:200:38: warning: > wm8974_aux_boost_controls defined but not used [-Wunused-const-variable=] > sound/soc/codecs/wm8974.c:204:38: warning: > wm8974_mic_boost_controls defined but not used [-Wunused-const-variable=] > > commit 8a123ee2a46d ("ASoC: WM8974 DAPM cleanups") > left behind this, remove them. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > sound/soc/codecs/wm8974.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c > index dc4fe4f5239d..06ba36595ddd 100644 > --- a/sound/soc/codecs/wm8974.c > +++ b/sound/soc/codecs/wm8974.c > @@ -196,14 +196,6 @@ SOC_DAPM_SINGLE("MicN Switch", WM8974_INPUT, 1, 1, 0), > SOC_DAPM_SINGLE("MicP Switch", WM8974_INPUT, 0, 1, 0), > }; > > -/* AUX Input boost vol */ > -static const struct snd_kcontrol_new wm8974_aux_boost_controls = > -SOC_DAPM_SINGLE("Aux Volume", WM8974_ADCBOOST, 0, 7, 0); > - > -/* Mic Input boost vol */ > -static const struct snd_kcontrol_new wm8974_mic_boost_controls = > -SOC_DAPM_SINGLE("Mic Volume", WM8974_ADCBOOST, 4, 7, 0); > - I am not sure this is quite the right fix both of these are valid controls on the CODEC, and looks a bit like they shouldn't have been orphaned in the original patch. But given they clearly haven't been used by anyone in ten years and unless Mark has any objections: Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index dc4fe4f5239d..06ba36595ddd 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -196,14 +196,6 @@ SOC_DAPM_SINGLE("MicN Switch", WM8974_INPUT, 1, 1, 0), SOC_DAPM_SINGLE("MicP Switch", WM8974_INPUT, 0, 1, 0), }; -/* AUX Input boost vol */ -static const struct snd_kcontrol_new wm8974_aux_boost_controls = -SOC_DAPM_SINGLE("Aux Volume", WM8974_ADCBOOST, 0, 7, 0); - -/* Mic Input boost vol */ -static const struct snd_kcontrol_new wm8974_mic_boost_controls = -SOC_DAPM_SINGLE("Mic Volume", WM8974_ADCBOOST, 4, 7, 0); - static const struct snd_soc_dapm_widget wm8974_dapm_widgets[] = { SND_SOC_DAPM_MIXER("Speaker Mixer", WM8974_POWER3, 2, 0, &wm8974_speaker_mixer_controls[0],
sound/soc/codecs/wm8974.c:200:38: warning: wm8974_aux_boost_controls defined but not used [-Wunused-const-variable=] sound/soc/codecs/wm8974.c:204:38: warning: wm8974_mic_boost_controls defined but not used [-Wunused-const-variable=] commit 8a123ee2a46d ("ASoC: WM8974 DAPM cleanups") left behind this, remove them. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- sound/soc/codecs/wm8974.c | 8 -------- 1 file changed, 8 deletions(-)