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

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

ASoC: wm_hubs: Use SOC_ENUM_SINGLE_DECL() 



Just replace with the helper macro.  No functional change at all.

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 38dbfb59

sound/soc/codecs/wm_hubs.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -50,16 +50,16 @@ static const char *speaker_ref_text[] = { 
	"VMID",

	"VMID",

};

};





static const struct soc_enum speaker_ref =

static SOC_ENUM_SINGLE_DECL(speaker_ref,

	SOC_ENUM_SINGLE(WM8993_SPEAKER_MIXER, 8, 2, speaker_ref_text);

			    WM8993_SPEAKER_MIXER, 8, speaker_ref_text);





static const char *speaker_mode_text[] = {

static const char *speaker_mode_text[] = {

	"Class D",

	"Class D",

	"Class AB",

	"Class AB",

};

};





static const struct soc_enum speaker_mode =

static SOC_ENUM_SINGLE_DECL(speaker_mode,

	SOC_ENUM_SINGLE(WM8993_SPKMIXR_ATTENUATION, 8, 2, speaker_mode_text);

			    WM8993_SPKMIXR_ATTENUATION, 8, speaker_mode_text);





static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)

static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)

{

{
@@ -735,15 +735,15 @@ static const char *hp_mux_text[] = { 
	"DAC",

	"DAC",

};

};





static const struct soc_enum hpl_enum =

static SOC_ENUM_SINGLE_DECL(hpl_enum,

	SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER1, 8, 2, hp_mux_text);

			    WM8993_OUTPUT_MIXER1, 8, hp_mux_text);





const struct snd_kcontrol_new wm_hubs_hpl_mux =

const struct snd_kcontrol_new wm_hubs_hpl_mux =

	WM_HUBS_ENUM_W("Left Headphone Mux", hpl_enum);

	WM_HUBS_ENUM_W("Left Headphone Mux", hpl_enum);

EXPORT_SYMBOL_GPL(wm_hubs_hpl_mux);

EXPORT_SYMBOL_GPL(wm_hubs_hpl_mux);





static const struct soc_enum hpr_enum =

static SOC_ENUM_SINGLE_DECL(hpr_enum,

	SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER2, 8, 2, hp_mux_text);

			    WM8993_OUTPUT_MIXER2, 8, hp_mux_text);





const struct snd_kcontrol_new wm_hubs_hpr_mux =

const struct snd_kcontrol_new wm_hubs_hpr_mux =

	WM_HUBS_ENUM_W("Right Headphone Mux", hpr_enum);

	WM_HUBS_ENUM_W("Right Headphone Mux", hpr_enum);