ASoC: wm2200: Correct types of mixer texts and values
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Thu, 10 Nov 2016 15:34:52 +0000 (15:34 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 10 Nov 2016 16:19:42 +0000 (16:19 +0000)
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>
sound/soc/codecs/wm2200.c

index 606bf88abfc444a9036695eebb0e459419041997..d83dab57a1d1f5171afbc9bf6b9d1c2f9c6a40ba 100644 (file)
@@ -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 */