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

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

ASoC: arizona: Fix wrong number of items in enum ctls 



arizona codec driver has a few places wrongly defining the number of
enum items.

Use SOC_ENUM_SINGLE_DECL() macro and they are automatically fixed.

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 48e50ce3

sound/soc/codecs/arizona.c

+40 −31
Original line number Diff line number Diff line
@@ -542,47 +542,55 @@ static const char *arizona_vol_ramp_text[] = { 
	"15ms/6dB", "30ms/6dB",

};



const struct soc_enum arizona_in_vd_ramp =

	SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,

			ARIZONA_IN_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_in_vd_ramp,

		     ARIZONA_INPUT_VOLUME_RAMP,

		     ARIZONA_IN_VD_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_in_vd_ramp);



const struct soc_enum arizona_in_vi_ramp =

	SOC_ENUM_SINGLE(ARIZONA_INPUT_VOLUME_RAMP,

			ARIZONA_IN_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_in_vi_ramp,

		     ARIZONA_INPUT_VOLUME_RAMP,

		     ARIZONA_IN_VI_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_in_vi_ramp);



const struct soc_enum arizona_out_vd_ramp =

	SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,

			ARIZONA_OUT_VD_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_out_vd_ramp,

		     ARIZONA_OUTPUT_VOLUME_RAMP,

		     ARIZONA_OUT_VD_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_out_vd_ramp);



const struct soc_enum arizona_out_vi_ramp =

	SOC_ENUM_SINGLE(ARIZONA_OUTPUT_VOLUME_RAMP,

			ARIZONA_OUT_VI_RAMP_SHIFT, 7, arizona_vol_ramp_text);

SOC_ENUM_SINGLE_DECL(arizona_out_vi_ramp,

		     ARIZONA_OUTPUT_VOLUME_RAMP,

		     ARIZONA_OUT_VI_RAMP_SHIFT,

		     arizona_vol_ramp_text);

EXPORT_SYMBOL_GPL(arizona_out_vi_ramp);



static const char *arizona_lhpf_mode_text[] = {

	"Low-pass", "High-pass"

};



const struct soc_enum arizona_lhpf1_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF1_1, ARIZONA_LHPF1_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf1_mode,

		     ARIZONA_HPLPF1_1,

		     ARIZONA_LHPF1_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf1_mode);



const struct soc_enum arizona_lhpf2_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF2_1, ARIZONA_LHPF2_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf2_mode,

		     ARIZONA_HPLPF2_1,

		     ARIZONA_LHPF2_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf2_mode);



const struct soc_enum arizona_lhpf3_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF3_1, ARIZONA_LHPF3_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf3_mode,

		     ARIZONA_HPLPF3_1,

		     ARIZONA_LHPF3_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf3_mode);



const struct soc_enum arizona_lhpf4_mode =

	SOC_ENUM_SINGLE(ARIZONA_HPLPF4_1, ARIZONA_LHPF4_MODE_SHIFT, 2,

SOC_ENUM_SINGLE_DECL(arizona_lhpf4_mode,

		     ARIZONA_HPLPF4_1,

		     ARIZONA_LHPF4_MODE_SHIFT,

		     arizona_lhpf_mode_text);

EXPORT_SYMBOL_GPL(arizona_lhpf4_mode);
@@ -590,18 +598,19 @@ static const char *arizona_ng_hold_text[] = { 
	"30ms", "120ms", "250ms", "500ms",

};



const struct soc_enum arizona_ng_hold =

	SOC_ENUM_SINGLE(ARIZONA_NOISE_GATE_CONTROL, ARIZONA_NGATE_HOLD_SHIFT,

			4, arizona_ng_hold_text);

SOC_ENUM_SINGLE_DECL(arizona_ng_hold,

		     ARIZONA_NOISE_GATE_CONTROL,

		     ARIZONA_NGATE_HOLD_SHIFT,

		     arizona_ng_hold_text);

EXPORT_SYMBOL_GPL(arizona_ng_hold);



static const char * const arizona_in_hpf_cut_text[] = {

	"2.5Hz", "5Hz", "10Hz", "20Hz", "40Hz"

};



const struct soc_enum arizona_in_hpf_cut_enum =

	SOC_ENUM_SINGLE(ARIZONA_HPF_CONTROL, ARIZONA_IN_HPF_CUT_SHIFT,

			ARRAY_SIZE(arizona_in_hpf_cut_text),

SOC_ENUM_SINGLE_DECL(arizona_in_hpf_cut_enum,

		     ARIZONA_HPF_CONTROL,

		     ARIZONA_IN_HPF_CUT_SHIFT,

		     arizona_in_hpf_cut_text);

EXPORT_SYMBOL_GPL(arizona_in_hpf_cut_enum);