1 files changed, 9 insertions, 14 deletions

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 0982c1d38ec4..721cee71d5fc 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -268,8 +268,7 @@ static const char *drc_high_text[] = {
         "0",
 };
 
-static const struct soc_enum drc_high =
-        SOC_ENUM_SINGLE(WM9081_DRC_3, 3, 6, drc_high_text);
+static SOC_ENUM_SINGLE_DECL(drc_high, WM9081_DRC_3, 3, drc_high_text);
 
 static const char *drc_low_text[] = {
         "1",
@@ -279,8 +278,7 @@ static const char *drc_low_text[] = {
         "0",
 };
 
-static const struct soc_enum drc_low =
-        SOC_ENUM_SINGLE(WM9081_DRC_3, 0, 5, drc_low_text);
+static SOC_ENUM_SINGLE_DECL(drc_low, WM9081_DRC_3, 0, drc_low_text);
 
 static const char *drc_atk_text[] = {
         "181us",
@@ -297,8 +295,7 @@ static const char *drc_atk_text[] = {
         "185.6ms",
 };
 
-static const struct soc_enum drc_atk =
-        SOC_ENUM_SINGLE(WM9081_DRC_2, 12, 12, drc_atk_text);
+static SOC_ENUM_SINGLE_DECL(drc_atk, WM9081_DRC_2, 12, drc_atk_text);
 
 static const char *drc_dcy_text[] = {
         "186ms",
@@ -312,8 +309,7 @@ static const char *drc_dcy_text[] = {
         "47.56s",
 };
 
-static const struct soc_enum drc_dcy =
-        SOC_ENUM_SINGLE(WM9081_DRC_2, 8, 9, drc_dcy_text);
+static SOC_ENUM_SINGLE_DECL(drc_dcy, WM9081_DRC_2, 8, drc_dcy_text);
 
 static const char *drc_qr_dcy_text[] = {
         "0.725ms",
@@ -321,8 +317,7 @@ static const char *drc_qr_dcy_text[] = {
         "5.8ms",
 };
 
-static const struct soc_enum drc_qr_dcy =
-        SOC_ENUM_SINGLE(WM9081_DRC_2, 4, 3, drc_qr_dcy_text);
+static SOC_ENUM_SINGLE_DECL(drc_qr_dcy, WM9081_DRC_2, 4, drc_qr_dcy_text);
 
 static const char *dac_deemph_text[] = {
         "None",
@@ -331,16 +326,16 @@ static const char *dac_deemph_text[] = {
         "48kHz",
 };
 
-static const struct soc_enum dac_deemph =
-        SOC_ENUM_SINGLE(WM9081_DAC_DIGITAL_2, 1, 4, dac_deemph_text);
+static SOC_ENUM_SINGLE_DECL(dac_deemph, WM9081_DAC_DIGITAL_2, 1,
+                            dac_deemph_text);
 
 static const char *speaker_mode_text[] = {
         "Class D",
         "Class AB",
 };
 
-static const struct soc_enum speaker_mode =
-        SOC_ENUM_SINGLE(WM9081_ANALOGUE_SPEAKER_2, 6, 2, speaker_mode_text);
+static SOC_ENUM_SINGLE_DECL(speaker_mode, WM9081_ANALOGUE_SPEAKER_2, 6,
+                            speaker_mode_text);
 
 static int speaker_mode_get(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)