... for improving readability and maintainability.
Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/soc/codecs/isabelle.c | 52 +++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index cb736ddc446d..3814719a9cc1 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -140,17 +140,17 @@ static const char *isabelle_rx1_texts[] = {"VRX1", "ARX1"}; static const char *isabelle_rx2_texts[] = {"VRX2", "ARX2"};
static const struct soc_enum isabelle_rx1_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 3, - ARRAY_SIZE(isabelle_rx1_texts), isabelle_rx1_texts), - SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 5, - ARRAY_SIZE(isabelle_rx1_texts), isabelle_rx1_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_VOICE_HPF_CFG_REG, 3, + isabelle_rx1_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_AUDIO_HPF_CFG_REG, 5, + isabelle_rx1_texts), };
static const struct soc_enum isabelle_rx2_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_VOICE_HPF_CFG_REG, 2, - ARRAY_SIZE(isabelle_rx2_texts), isabelle_rx2_texts), - SOC_ENUM_SINGLE(ISABELLE_AUDIO_HPF_CFG_REG, 4, - ARRAY_SIZE(isabelle_rx2_texts), isabelle_rx2_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_VOICE_HPF_CFG_REG, 2, + isabelle_rx2_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_AUDIO_HPF_CFG_REG, 4, + isabelle_rx2_texts), };
/* Headset DAC playback switches */ @@ -165,17 +165,17 @@ static const char *isabelle_atx_texts[] = {"AMIC1", "DMIC"}; static const char *isabelle_vtx_texts[] = {"AMIC2", "DMIC"};
static const struct soc_enum isabelle_atx_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 7, - ARRAY_SIZE(isabelle_atx_texts), isabelle_atx_texts), - SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0, - ARRAY_SIZE(isabelle_atx_texts), isabelle_atx_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_AMIC_CFG_REG, 7, + isabelle_atx_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_DMIC_CFG_REG, 0, + isabelle_atx_texts), };
static const struct soc_enum isabelle_vtx_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_AMIC_CFG_REG, 6, - ARRAY_SIZE(isabelle_vtx_texts), isabelle_vtx_texts), - SOC_ENUM_SINGLE(ISABELLE_DMIC_CFG_REG, 0, - ARRAY_SIZE(isabelle_vtx_texts), isabelle_vtx_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_AMIC_CFG_REG, 6, + isabelle_vtx_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_DMIC_CFG_REG, 0, + isabelle_vtx_texts), };
static const struct snd_kcontrol_new atx_mux_controls = @@ -210,21 +210,17 @@ static const char *isabelle_st_audio_texts[] = {"ATX1", "ATX2"}; static const char *isabelle_st_voice_texts[] = {"VTX1", "VTX2"};
static const struct soc_enum isabelle_st_audio_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA1_CFG_REG, 7, - ARRAY_SIZE(isabelle_st_audio_texts), - isabelle_st_audio_texts), - SOC_ENUM_SINGLE(ISABELLE_ATX_STPGA2_CFG_REG, 7, - ARRAY_SIZE(isabelle_st_audio_texts), - isabelle_st_audio_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_ATX_STPGA1_CFG_REG, 7, + isabelle_st_audio_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_ATX_STPGA2_CFG_REG, 7, + isabelle_st_audio_texts), };
static const struct soc_enum isabelle_st_voice_enum[] = { - SOC_ENUM_SINGLE(ISABELLE_VTX_STPGA1_CFG_REG, 7, - ARRAY_SIZE(isabelle_st_voice_texts), - isabelle_st_voice_texts), - SOC_ENUM_SINGLE(ISABELLE_VTX2_STPGA2_CFG_REG, 7, - ARRAY_SIZE(isabelle_st_voice_texts), - isabelle_st_voice_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_VTX_STPGA1_CFG_REG, 7, + isabelle_st_voice_texts), + SOC_ENUM_SINGLE_CONST(ISABELLE_VTX2_STPGA2_CFG_REG, 7, + isabelle_st_voice_texts), };
static const struct snd_kcontrol_new st_audio_control =