Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae170688 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: wm8983: Remove superfluous const 



As SOC_ENUM_SINGLE_DECL() itself contains const modifier now, we can
reduce const from its users.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 11a544bb

sound/soc/codecs/wm8983.c

+17 −22
Original line number Original line Diff line number Diff line
@@ -205,48 +205,43 @@ static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0); 
static const DECLARE_TLV_DB_SCALE(pga_boost_tlv, 0, 2000, 0);

static const DECLARE_TLV_DB_SCALE(pga_boost_tlv, 0, 2000, 0);





static const char *alc_sel_text[] = { "Off", "Right", "Left", "Stereo" };

static const char *alc_sel_text[] = { "Off", "Right", "Left", "Stereo" };

static const SOC_ENUM_SINGLE_DECL(alc_sel, WM8983_ALC_CONTROL_1, 7,

static SOC_ENUM_SINGLE_DECL(alc_sel, WM8983_ALC_CONTROL_1, 7, alc_sel_text);

				  alc_sel_text);





static const char *alc_mode_text[] = { "ALC", "Limiter" };

static const char *alc_mode_text[] = { "ALC", "Limiter" };

static const SOC_ENUM_SINGLE_DECL(alc_mode, WM8983_ALC_CONTROL_3, 8,

static SOC_ENUM_SINGLE_DECL(alc_mode, WM8983_ALC_CONTROL_3, 8, alc_mode_text);

				  alc_mode_text);





static const char *filter_mode_text[] = { "Audio", "Application" };

static const char *filter_mode_text[] = { "Audio", "Application" };

static const SOC_ENUM_SINGLE_DECL(filter_mode, WM8983_ADC_CONTROL, 7,

static SOC_ENUM_SINGLE_DECL(filter_mode, WM8983_ADC_CONTROL, 7,

			    filter_mode_text);

			    filter_mode_text);





static const char *eq_bw_text[] = { "Narrow", "Wide" };

static const char *eq_bw_text[] = { "Narrow", "Wide" };

static const char *eqmode_text[] = { "Capture", "Playback" };

static const char *eqmode_text[] = { "Capture", "Playback" };

static const SOC_ENUM_SINGLE_EXT_DECL(eqmode, eqmode_text);

static SOC_ENUM_SINGLE_EXT_DECL(eqmode, eqmode_text);





static const char *eq1_cutoff_text[] = {

static const char *eq1_cutoff_text[] = {

	"80Hz", "105Hz", "135Hz", "175Hz"

	"80Hz", "105Hz", "135Hz", "175Hz"

};

};

static const SOC_ENUM_SINGLE_DECL(eq1_cutoff, WM8983_EQ1_LOW_SHELF, 5,

static SOC_ENUM_SINGLE_DECL(eq1_cutoff, WM8983_EQ1_LOW_SHELF, 5,

			    eq1_cutoff_text);

			    eq1_cutoff_text);

static const char *eq2_cutoff_text[] = {

static const char *eq2_cutoff_text[] = {

	"230Hz", "300Hz", "385Hz", "500Hz"

	"230Hz", "300Hz", "385Hz", "500Hz"

};

};

static const SOC_ENUM_SINGLE_DECL(eq2_bw, WM8983_EQ2_PEAK_1, 8, eq_bw_text);

static SOC_ENUM_SINGLE_DECL(eq2_bw, WM8983_EQ2_PEAK_1, 8, eq_bw_text);

static const SOC_ENUM_SINGLE_DECL(eq2_cutoff, WM8983_EQ2_PEAK_1, 5,

static SOC_ENUM_SINGLE_DECL(eq2_cutoff, WM8983_EQ2_PEAK_1, 5, eq2_cutoff_text);

				  eq2_cutoff_text);

static const char *eq3_cutoff_text[] = {

static const char *eq3_cutoff_text[] = {

	"650Hz", "850Hz", "1.1kHz", "1.4kHz"

	"650Hz", "850Hz", "1.1kHz", "1.4kHz"

};

};

static const SOC_ENUM_SINGLE_DECL(eq3_bw, WM8983_EQ3_PEAK_2, 8, eq_bw_text);

static SOC_ENUM_SINGLE_DECL(eq3_bw, WM8983_EQ3_PEAK_2, 8, eq_bw_text);

static const SOC_ENUM_SINGLE_DECL(eq3_cutoff, WM8983_EQ3_PEAK_2, 5,

static SOC_ENUM_SINGLE_DECL(eq3_cutoff, WM8983_EQ3_PEAK_2, 5, eq3_cutoff_text);

				  eq3_cutoff_text);

static const char *eq4_cutoff_text[] = {

static const char *eq4_cutoff_text[] = {

	"1.8kHz", "2.4kHz", "3.2kHz", "4.1kHz"

	"1.8kHz", "2.4kHz", "3.2kHz", "4.1kHz"

};

};

static const SOC_ENUM_SINGLE_DECL(eq4_bw, WM8983_EQ4_PEAK_3, 8, eq_bw_text);

static SOC_ENUM_SINGLE_DECL(eq4_bw, WM8983_EQ4_PEAK_3, 8, eq_bw_text);

static const SOC_ENUM_SINGLE_DECL(eq4_cutoff, WM8983_EQ4_PEAK_3, 5,

static SOC_ENUM_SINGLE_DECL(eq4_cutoff, WM8983_EQ4_PEAK_3, 5, eq4_cutoff_text);

				  eq4_cutoff_text);

static const char *eq5_cutoff_text[] = {

static const char *eq5_cutoff_text[] = {

	"5.3kHz", "6.9kHz", "9kHz", "11.7kHz"

	"5.3kHz", "6.9kHz", "9kHz", "11.7kHz"

};

};

static const SOC_ENUM_SINGLE_DECL(eq5_cutoff, WM8983_EQ5_HIGH_SHELF, 5,

static SOC_ENUM_SINGLE_DECL(eq5_cutoff, WM8983_EQ5_HIGH_SHELF, 5,

			    eq5_cutoff_text);

			    eq5_cutoff_text);





static const char *depth_3d_text[] = {

static const char *depth_3d_text[] = {
@@ -267,7 +262,7 @@ static const char *depth_3d_text[] = { 
	"93.3%",

	"93.3%",

	"100%"

	"100%"

};

};

static const SOC_ENUM_SINGLE_DECL(depth_3d, WM8983_3D_CONTROL, 0,

static SOC_ENUM_SINGLE_DECL(depth_3d, WM8983_3D_CONTROL, 0,

			    depth_3d_text);

			    depth_3d_text);





static const struct snd_kcontrol_new wm8983_snd_controls[] = {

static const struct snd_kcontrol_new wm8983_snd_controls[] = {