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

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

ASoC: rt5631: 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 avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a7509874

sound/soc/codecs/rt5631.c

+30 −45
Original line number Diff line number Diff line
@@ -210,25 +210,21 @@ static int rt5631_dmic_put(struct snd_kcontrol *kcontrol, 
static const char *rt5631_input_mode[] = {

	"Single ended", "Differential"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_mic1_mode_enum, RT5631_MIC_CTRL_1,

static SOC_ENUM_SINGLE_DECL(rt5631_mic1_mode_enum, RT5631_MIC_CTRL_1,

			    RT5631_MIC1_DIFF_INPUT_SHIFT, rt5631_input_mode);



static const SOC_ENUM_SINGLE_DECL(

	rt5631_mic2_mode_enum, RT5631_MIC_CTRL_1,

static SOC_ENUM_SINGLE_DECL(rt5631_mic2_mode_enum, RT5631_MIC_CTRL_1,

			    RT5631_MIC2_DIFF_INPUT_SHIFT, rt5631_input_mode);



/* MONO Input Type */

static const SOC_ENUM_SINGLE_DECL(

	rt5631_monoin_mode_enum, RT5631_MONO_INPUT_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_monoin_mode_enum, RT5631_MONO_INPUT_VOL,

			    RT5631_MONO_DIFF_INPUT_SHIFT, rt5631_input_mode);



/* SPK Ratio Gain Control */

static const char *rt5631_spk_ratio[] = {"1.00x", "1.09x", "1.27x", "1.44x",

			"1.56x", "1.68x", "1.99x", "2.34x"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_spk_ratio_enum, RT5631_GEN_PUR_CTRL_REG,

static SOC_ENUM_SINGLE_DECL(rt5631_spk_ratio_enum, RT5631_GEN_PUR_CTRL_REG,

			    RT5631_SPK_AMP_RATIO_CTRL_SHIFT, rt5631_spk_ratio);



static const struct snd_kcontrol_new rt5631_snd_controls[] = {
@@ -759,8 +755,7 @@ static const struct snd_kcontrol_new rt5631_monomix_mixer_controls[] = { 
/* Left SPK Volume Input */

static const char *rt5631_spkvoll_sel[] = {"Vmid", "SPKMIXL"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_spkvoll_enum, RT5631_SPK_OUT_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_spkvoll_enum, RT5631_SPK_OUT_VOL,

			    RT5631_L_EN_SHIFT, rt5631_spkvoll_sel);



static const struct snd_kcontrol_new rt5631_spkvoll_mux_control =
@@ -769,8 +764,7 @@ static const struct snd_kcontrol_new rt5631_spkvoll_mux_control = 
/* Left HP Volume Input */

static const char *rt5631_hpvoll_sel[] = {"Vmid", "OUTMIXL"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_hpvoll_enum, RT5631_HP_OUT_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_hpvoll_enum, RT5631_HP_OUT_VOL,

			    RT5631_L_EN_SHIFT, rt5631_hpvoll_sel);



static const struct snd_kcontrol_new rt5631_hpvoll_mux_control =
@@ -779,8 +773,7 @@ static const struct snd_kcontrol_new rt5631_hpvoll_mux_control = 
/* Left Out Volume Input */

static const char *rt5631_outvoll_sel[] = {"Vmid", "OUTMIXL"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_outvoll_enum, RT5631_MONO_AXO_1_2_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_outvoll_enum, RT5631_MONO_AXO_1_2_VOL,

			    RT5631_L_EN_SHIFT, rt5631_outvoll_sel);



static const struct snd_kcontrol_new rt5631_outvoll_mux_control =
@@ -789,8 +782,7 @@ static const struct snd_kcontrol_new rt5631_outvoll_mux_control = 
/* Right Out Volume Input */

static const char *rt5631_outvolr_sel[] = {"Vmid", "OUTMIXR"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_outvolr_enum, RT5631_MONO_AXO_1_2_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_outvolr_enum, RT5631_MONO_AXO_1_2_VOL,

			    RT5631_R_EN_SHIFT, rt5631_outvolr_sel);



static const struct snd_kcontrol_new rt5631_outvolr_mux_control =
@@ -799,8 +791,7 @@ static const struct snd_kcontrol_new rt5631_outvolr_mux_control = 
/* Right HP Volume Input */

static const char *rt5631_hpvolr_sel[] = {"Vmid", "OUTMIXR"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_hpvolr_enum, RT5631_HP_OUT_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_hpvolr_enum, RT5631_HP_OUT_VOL,

			    RT5631_R_EN_SHIFT, rt5631_hpvolr_sel);



static const struct snd_kcontrol_new rt5631_hpvolr_mux_control =
@@ -809,8 +800,7 @@ static const struct snd_kcontrol_new rt5631_hpvolr_mux_control = 
/* Right SPK Volume Input */

static const char *rt5631_spkvolr_sel[] = {"Vmid", "SPKMIXR"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_spkvolr_enum, RT5631_SPK_OUT_VOL,

static SOC_ENUM_SINGLE_DECL(rt5631_spkvolr_enum, RT5631_SPK_OUT_VOL,

			    RT5631_R_EN_SHIFT, rt5631_spkvolr_sel);



static const struct snd_kcontrol_new rt5631_spkvolr_mux_control =
@@ -820,8 +810,7 @@ static const struct snd_kcontrol_new rt5631_spkvolr_mux_control = 
static const char *rt5631_spol_src_sel[] = {

	"SPOLMIX", "MONOIN_RX", "VDAC", "DACL"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_spol_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

static SOC_ENUM_SINGLE_DECL(rt5631_spol_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

			    RT5631_SPK_L_MUX_SEL_SHIFT, rt5631_spol_src_sel);



static const struct snd_kcontrol_new rt5631_spol_mux_control =
@@ -831,8 +820,7 @@ static const struct snd_kcontrol_new rt5631_spol_mux_control = 
static const char *rt5631_spor_src_sel[] = {

	"SPORMIX", "MONOIN_RX", "VDAC", "DACR"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_spor_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

static SOC_ENUM_SINGLE_DECL(rt5631_spor_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

			    RT5631_SPK_R_MUX_SEL_SHIFT, rt5631_spor_src_sel);



static const struct snd_kcontrol_new rt5631_spor_mux_control =
@@ -841,8 +829,7 @@ static const struct snd_kcontrol_new rt5631_spor_mux_control = 
/* MONO Input */

static const char *rt5631_mono_src_sel[] = {"MONOMIX", "MONOIN_RX", "VDAC"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_mono_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

static SOC_ENUM_SINGLE_DECL(rt5631_mono_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

			    RT5631_MONO_MUX_SEL_SHIFT, rt5631_mono_src_sel);



static const struct snd_kcontrol_new rt5631_mono_mux_control =
@@ -851,8 +838,7 @@ static const struct snd_kcontrol_new rt5631_mono_mux_control = 
/* Left HPO Input */

static const char *rt5631_hpl_src_sel[] = {"Left HPVOL", "Left DAC"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_hpl_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

static SOC_ENUM_SINGLE_DECL(rt5631_hpl_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

			    RT5631_HP_L_MUX_SEL_SHIFT, rt5631_hpl_src_sel);



static const struct snd_kcontrol_new rt5631_hpl_mux_control =
@@ -861,8 +847,7 @@ static const struct snd_kcontrol_new rt5631_hpl_mux_control = 
/* Right HPO Input */

static const char *rt5631_hpr_src_sel[] = {"Right HPVOL", "Right DAC"};



static const SOC_ENUM_SINGLE_DECL(

	rt5631_hpr_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

static SOC_ENUM_SINGLE_DECL(rt5631_hpr_src_enum, RT5631_SPK_MONO_HP_OUT_CTRL,

			    RT5631_HP_R_MUX_SEL_SHIFT, rt5631_hpr_src_sel);



static const struct snd_kcontrol_new rt5631_hpr_mux_control =