ASoC: wm_hubs: Use SOC_ENUM_SINGLE_DECL()

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Takashi Iwai 2014-02-18 10:47:17 +01:00 committed by Mark Brown
parent 38dbfb59d1
commit abc4b4fb94

View File

@ -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);