@@ -113,20 +113,20 @@ static const char *wm8971_adcpol[] = {"Normal", "L Invert", "R Invert",
"L + R Invert"};
static const struct soc_enum wm8971_enum[] = {
- SOC_ENUM_SINGLE(WM8971_BASS, 7, 2, wm8971_bass), /* 0 */
- SOC_ENUM_SINGLE(WM8971_BASS, 6, 2, wm8971_bass_filter),
- SOC_ENUM_SINGLE(WM8971_TREBLE, 6, 2, wm8971_treble),
- SOC_ENUM_SINGLE(WM8971_ALC1, 7, 4, wm8971_alc_func),
- SOC_ENUM_SINGLE(WM8971_NGATE, 1, 2, wm8971_ng_type), /* 4 */
- SOC_ENUM_SINGLE(WM8971_ADCDAC, 1, 4, wm8971_deemp),
- SOC_ENUM_SINGLE(WM8971_ADCTL1, 4, 4, wm8971_mono_mux),
- SOC_ENUM_SINGLE(WM8971_ADCTL1, 1, 2, wm8971_dac_phase),
- SOC_ENUM_SINGLE(WM8971_LOUTM1, 0, 5, wm8971_lline_mux), /* 8 */
- SOC_ENUM_SINGLE(WM8971_ROUTM1, 0, 5, wm8971_rline_mux),
- SOC_ENUM_SINGLE(WM8971_LADCIN, 6, 4, wm8971_lpga_sel),
- SOC_ENUM_SINGLE(WM8971_RADCIN, 6, 4, wm8971_rpga_sel),
- SOC_ENUM_SINGLE(WM8971_ADCDAC, 5, 4, wm8971_adcpol), /* 12 */
- SOC_ENUM_SINGLE(WM8971_ADCIN, 6, 4, wm8971_mono_mux),
+ SOC_ENUM_SINGLE_CONST(WM8971_BASS, 7, wm8971_bass), /* 0 */
+ SOC_ENUM_SINGLE_CONST(WM8971_BASS, 6, wm8971_bass_filter),
+ SOC_ENUM_SINGLE_CONST(WM8971_TREBLE, 6, wm8971_treble),
+ SOC_ENUM_SINGLE_CONST(WM8971_ALC1, 7, wm8971_alc_func),
+ SOC_ENUM_SINGLE_CONST(WM8971_NGATE, 1, wm8971_ng_type), /* 4 */
+ SOC_ENUM_SINGLE_CONST(WM8971_ADCDAC, 1, wm8971_deemp),
+ SOC_ENUM_SINGLE_CONST(WM8971_ADCTL1, 4, wm8971_mono_mux),
+ SOC_ENUM_SINGLE_CONST(WM8971_ADCTL1, 1, wm8971_dac_phase),
+ SOC_ENUM_SINGLE_CONST(WM8971_LOUTM1, 0, wm8971_lline_mux), /* 8 */
+ SOC_ENUM_SINGLE_CONST(WM8971_ROUTM1, 0, wm8971_rline_mux),
+ SOC_ENUM_SINGLE_CONST(WM8971_LADCIN, 6, wm8971_lpga_sel),
+ SOC_ENUM_SINGLE_CONST(WM8971_RADCIN, 6, wm8971_rpga_sel),
+ SOC_ENUM_SINGLE_CONST(WM8971_ADCDAC, 5, wm8971_adcpol), /* 12 */
+ SOC_ENUM_SINGLE_CONST(WM8971_ADCIN, 6, wm8971_mono_mux),
};
static const struct snd_kcontrol_new wm8971_snd_controls[] = {
... for improving readability and maintainability. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/soc/codecs/wm8971.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)