projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
617c773
)
ASoC: rt5660: remove double const
author
Nicholas Mc Guire
<hofrat@osadl.org>
Thu, 12 Jan 2017 10:48:11 +0000
(11:48 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 8 Oct 2017 08:26:12 +0000
(10:26 +0200)
commit
4281fcc02ed9f902dfa52d3635ac7f04b1a7341f
upstream.
Drop the const qualifier as it is being added by SOC_ENUM_DOUBLE_DECL()
already which is called by SOC_ENUM_SINGLE_DECL() here.
Fixes: commit
2b26dd4c1fc5
("ASoC: rt5660: add rt5660 codec driver")
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/rt5660.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/rt5660.c
b/sound/soc/codecs/rt5660.c
index
9f0933c
..
e396b76
100644
(file)
--- a/
sound/soc/codecs/rt5660.c
+++ b/
sound/soc/codecs/rt5660.c
@@
-526,10
+526,10
@@
static const char * const rt5660_data_select[] = {
"L/R", "R/L", "L/L", "R/R"
};
-static
const
SOC_ENUM_SINGLE_DECL(rt5660_if1_dac_enum,
+static SOC_ENUM_SINGLE_DECL(rt5660_if1_dac_enum,
RT5660_DIG_INF1_DATA, RT5660_IF1_DAC_IN_SFT, rt5660_data_select);
-static
const
SOC_ENUM_SINGLE_DECL(rt5660_if1_adc_enum,
+static SOC_ENUM_SINGLE_DECL(rt5660_if1_adc_enum,
RT5660_DIG_INF1_DATA, RT5660_IF1_ADC_IN_SFT, rt5660_data_select);
static const struct snd_kcontrol_new rt5660_if1_dac_swap_mux =