diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2016-11-10 15:34:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-11-10 16:19:42 +0000 |
| commit | 4090d63b49d7d440ff984db3715d5c780209e8e8 (patch) | |
| tree | 9a227799590b8ecc8b78e20cb6707b8d40b3b3f8 /sound | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | linux-stable-4090d63b49d7d440ff984db3715d5c780209e8e8.tar.gz linux-stable-4090d63b49d7d440ff984db3715d5c780209e8e8.tar.bz2 linux-stable-4090d63b49d7d440ff984db3715d5c780209e8e8.zip | |
ASoC: wm2200: Correct types of mixer texts and values
The core expects "const char * const" and "unsigned int" for enum
controls, the mixer control definitions in wm2200 use "const char *"
and "int". This patch corrects the type of these arrays.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 606bf88abfc4..d83dab57a1d1 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -999,7 +999,7 @@ static DECLARE_TLV_DB_SCALE(in_tlv, -6300, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0); static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0); -static const char *wm2200_mixer_texts[] = { +static const char * const wm2200_mixer_texts[] = { "None", "Tone Generator", "AEC Loopback", @@ -1033,7 +1033,7 @@ static const char *wm2200_mixer_texts[] = { "DSP2.6", }; -static int wm2200_mixer_values[] = { +static unsigned int wm2200_mixer_values[] = { 0x00, 0x04, /* Tone */ 0x08, /* AEC */ |