1 files changed, 36 insertions, 36 deletions
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 06edb396e733..42c5b458b046 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -187,42 +187,42 @@ static const unsigned int sta32x_limiter_drc_release_tlv[] = {
        13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),
 };
-static const struct soc_enum sta32x_drc_ac_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_drc_ac_enum,
-        SOC_ENUM_SINGLE(STA32X_CONFD, STA32X_CONFD_DRC_SHIFT,
+                            STA32X_CONFD, STA32X_CONFD_DRC_SHIFT,
-                        2, sta32x_drc_ac);
+                            sta32x_drc_ac);
-static const struct soc_enum sta32x_auto_eq_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_auto_eq_enum,
-        SOC_ENUM_SINGLE(STA32X_AUTO1, STA32X_AUTO1_AMEQ_SHIFT,
+                            STA32X_AUTO1, STA32X_AUTO1_AMEQ_SHIFT,
-                        3, sta32x_auto_eq_mode);
+                            sta32x_auto_eq_mode);
-static const struct soc_enum sta32x_auto_gc_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_auto_gc_enum,
-        SOC_ENUM_SINGLE(STA32X_AUTO1, STA32X_AUTO1_AMGC_SHIFT,
+                            STA32X_AUTO1, STA32X_AUTO1_AMGC_SHIFT,
-                        4, sta32x_auto_gc_mode);
+                            sta32x_auto_gc_mode);
-static const struct soc_enum sta32x_auto_xo_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_auto_xo_enum,
-        SOC_ENUM_SINGLE(STA32X_AUTO2, STA32X_AUTO2_XO_SHIFT,
+                            STA32X_AUTO2, STA32X_AUTO2_XO_SHIFT,
-                        16, sta32x_auto_xo_mode);
+                            sta32x_auto_xo_mode);
-static const struct soc_enum sta32x_preset_eq_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_preset_eq_enum,
-        SOC_ENUM_SINGLE(STA32X_AUTO3, STA32X_AUTO3_PEQ_SHIFT,
+                            STA32X_AUTO3, STA32X_AUTO3_PEQ_SHIFT,
-                        32, sta32x_preset_eq_mode);
+                            sta32x_preset_eq_mode);
-static const struct soc_enum sta32x_limiter_ch1_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch1_enum,
-        SOC_ENUM_SINGLE(STA32X_C1CFG, STA32X_CxCFG_LS_SHIFT,
+                            STA32X_C1CFG, STA32X_CxCFG_LS_SHIFT,
-                        3, sta32x_limiter_select);
+                            sta32x_limiter_select);
-static const struct soc_enum sta32x_limiter_ch2_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch2_enum,
-        SOC_ENUM_SINGLE(STA32X_C2CFG, STA32X_CxCFG_LS_SHIFT,
+                            STA32X_C2CFG, STA32X_CxCFG_LS_SHIFT,
-                        3, sta32x_limiter_select);
+                            sta32x_limiter_select);
-static const struct soc_enum sta32x_limiter_ch3_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch3_enum,
-        SOC_ENUM_SINGLE(STA32X_C3CFG, STA32X_CxCFG_LS_SHIFT,
+                            STA32X_C3CFG, STA32X_CxCFG_LS_SHIFT,
-                        3, sta32x_limiter_select);
+                            sta32x_limiter_select);
-static const struct soc_enum sta32x_limiter1_attack_rate_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_attack_rate_enum,
-        SOC_ENUM_SINGLE(STA32X_L1AR, STA32X_LxA_SHIFT,
+                            STA32X_L1AR, STA32X_LxA_SHIFT,
-                        16, sta32x_limiter_attack_rate);
+                            sta32x_limiter_attack_rate);
-static const struct soc_enum sta32x_limiter2_attack_rate_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_attack_rate_enum,
-        SOC_ENUM_SINGLE(STA32X_L2AR, STA32X_LxA_SHIFT,
+                            STA32X_L2AR, STA32X_LxA_SHIFT,
-                        16, sta32x_limiter_attack_rate);
+                            sta32x_limiter_attack_rate);
-static const struct soc_enum sta32x_limiter1_release_rate_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_release_rate_enum,
-        SOC_ENUM_SINGLE(STA32X_L1AR, STA32X_LxR_SHIFT,
+                            STA32X_L1AR, STA32X_LxR_SHIFT,
-                        16, sta32x_limiter_release_rate);
+                            sta32x_limiter_release_rate);
-static const struct soc_enum sta32x_limiter2_release_rate_enum =
+static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_release_rate_enum,
-        SOC_ENUM_SINGLE(STA32X_L2AR, STA32X_LxR_SHIFT,
+                            STA32X_L2AR, STA32X_LxR_SHIFT,
-                        16, sta32x_limiter_release_rate);
+                            sta32x_limiter_release_rate);
 /* byte array controls for setting biquad, mixer, scaling coefficients;
 * for biquads all five coefficients need to be set in one go,

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 06edb396e733..42c5b458b046 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c
@@ -187,42 +187,42 @@ static const unsigned int sta32x_limiter_drc_release_tlv[] = {
187	13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),	187	13, 16, TLV_DB_SCALE_ITEM(-1500, 300, 0),
188	};	188	};
189		189
190	static const struct soc_enum sta32x_drc_ac_enum =	190	static SOC_ENUM_SINGLE_DECL(sta32x_drc_ac_enum,
191	SOC_ENUM_SINGLE(STA32X_CONFD, STA32X_CONFD_DRC_SHIFT,	191	STA32X_CONFD, STA32X_CONFD_DRC_SHIFT,
192	2, sta32x_drc_ac);	192	sta32x_drc_ac);
193	static const struct soc_enum sta32x_auto_eq_enum =	193	static SOC_ENUM_SINGLE_DECL(sta32x_auto_eq_enum,
194	SOC_ENUM_SINGLE(STA32X_AUTO1, STA32X_AUTO1_AMEQ_SHIFT,	194	STA32X_AUTO1, STA32X_AUTO1_AMEQ_SHIFT,
195	3, sta32x_auto_eq_mode);	195	sta32x_auto_eq_mode);
196	static const struct soc_enum sta32x_auto_gc_enum =	196	static SOC_ENUM_SINGLE_DECL(sta32x_auto_gc_enum,
197	SOC_ENUM_SINGLE(STA32X_AUTO1, STA32X_AUTO1_AMGC_SHIFT,	197	STA32X_AUTO1, STA32X_AUTO1_AMGC_SHIFT,
198	4, sta32x_auto_gc_mode);	198	sta32x_auto_gc_mode);
199	static const struct soc_enum sta32x_auto_xo_enum =	199	static SOC_ENUM_SINGLE_DECL(sta32x_auto_xo_enum,
200	SOC_ENUM_SINGLE(STA32X_AUTO2, STA32X_AUTO2_XO_SHIFT,	200	STA32X_AUTO2, STA32X_AUTO2_XO_SHIFT,
201	16, sta32x_auto_xo_mode);	201	sta32x_auto_xo_mode);
202	static const struct soc_enum sta32x_preset_eq_enum =	202	static SOC_ENUM_SINGLE_DECL(sta32x_preset_eq_enum,
203	SOC_ENUM_SINGLE(STA32X_AUTO3, STA32X_AUTO3_PEQ_SHIFT,	203	STA32X_AUTO3, STA32X_AUTO3_PEQ_SHIFT,
204	32, sta32x_preset_eq_mode);	204	sta32x_preset_eq_mode);
205	static const struct soc_enum sta32x_limiter_ch1_enum =	205	static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch1_enum,
206	SOC_ENUM_SINGLE(STA32X_C1CFG, STA32X_CxCFG_LS_SHIFT,	206	STA32X_C1CFG, STA32X_CxCFG_LS_SHIFT,
207	3, sta32x_limiter_select);	207	sta32x_limiter_select);
208	static const struct soc_enum sta32x_limiter_ch2_enum =	208	static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch2_enum,
209	SOC_ENUM_SINGLE(STA32X_C2CFG, STA32X_CxCFG_LS_SHIFT,	209	STA32X_C2CFG, STA32X_CxCFG_LS_SHIFT,
210	3, sta32x_limiter_select);	210	sta32x_limiter_select);
211	static const struct soc_enum sta32x_limiter_ch3_enum =	211	static SOC_ENUM_SINGLE_DECL(sta32x_limiter_ch3_enum,
212	SOC_ENUM_SINGLE(STA32X_C3CFG, STA32X_CxCFG_LS_SHIFT,	212	STA32X_C3CFG, STA32X_CxCFG_LS_SHIFT,
213	3, sta32x_limiter_select);	213	sta32x_limiter_select);
214	static const struct soc_enum sta32x_limiter1_attack_rate_enum =	214	static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_attack_rate_enum,
215	SOC_ENUM_SINGLE(STA32X_L1AR, STA32X_LxA_SHIFT,	215	STA32X_L1AR, STA32X_LxA_SHIFT,
216	16, sta32x_limiter_attack_rate);	216	sta32x_limiter_attack_rate);
217	static const struct soc_enum sta32x_limiter2_attack_rate_enum =	217	static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_attack_rate_enum,
218	SOC_ENUM_SINGLE(STA32X_L2AR, STA32X_LxA_SHIFT,	218	STA32X_L2AR, STA32X_LxA_SHIFT,
219	16, sta32x_limiter_attack_rate);	219	sta32x_limiter_attack_rate);
220	static const struct soc_enum sta32x_limiter1_release_rate_enum =	220	static SOC_ENUM_SINGLE_DECL(sta32x_limiter1_release_rate_enum,
221	SOC_ENUM_SINGLE(STA32X_L1AR, STA32X_LxR_SHIFT,	221	STA32X_L1AR, STA32X_LxR_SHIFT,
222	16, sta32x_limiter_release_rate);	222	sta32x_limiter_release_rate);
223	static const struct soc_enum sta32x_limiter2_release_rate_enum =	223	static SOC_ENUM_SINGLE_DECL(sta32x_limiter2_release_rate_enum,
224	SOC_ENUM_SINGLE(STA32X_L2AR, STA32X_LxR_SHIFT,	224	STA32X_L2AR, STA32X_LxR_SHIFT,
225	16, sta32x_limiter_release_rate);	225	sta32x_limiter_release_rate);
226		226
227	/* byte array controls for setting biquad, mixer, scaling coefficients;	227	/* byte array controls for setting biquad, mixer, scaling coefficients;
228	* for biquads all five coefficients need to be set in one go,	228	* for biquads all five coefficients need to be set in one go,