From: Krzysztof Kozlowski Date: Thu, 23 May 2024 10:42:26 +0000 (+0200) Subject: ASoC: codecs: wcd938x: Unify define used for MIC2 bias register X-Git-Tag: v6.11-rc1~108^2~6^2~152 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40b2ffaf594cdf9e4a86d4f28b392e58b9dafafd;p=thirdparty%2Fkernel%2Flinux.git ASoC: codecs: wcd938x: Unify define used for MIC2 bias register There is a define for MIC bias registers enable mask called WCD938X_MICB_EN_MASK, which is already used to handle all four MIC1-4 biases in wcd938x_mbhc_micb_adjust_voltage(). Use the same define also in wcd938x_mbhc_micb_en_status() for MIC2 to have unified, simpler approach. Signed-off-by: Krzysztof Kozlowski Link: https://msgid.link/r/20240523104228.36263-2-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown --- diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 6021aa5a56891..9e2070356b843 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1982,7 +1982,7 @@ static bool wcd938x_mbhc_micb_en_status(struct snd_soc_component *component, int if (micb_num == MIC_BIAS_2) { val = snd_soc_component_read_field(component, WCD938X_ANA_MICB2, - WCD938X_ANA_MICB2_ENABLE_MASK); + WCD938X_MICB_EN_MASK); if (val == WCD938X_MICB_ENABLE) return true; } diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h index df07e92d9d979..0d332cb555acf 100644 --- a/sound/soc/codecs/wcd938x.h +++ b/sound/soc/codecs/wcd938x.h @@ -75,7 +75,6 @@ #define WCD938X_MICB_PULL_UP 2 #define WCD938X_MICB_PULL_DOWN 3 #define WCD938X_ANA_MICB2 (0x3023) -#define WCD938X_ANA_MICB2_ENABLE_MASK GENMASK(7, 6) #define WCD938X_ANA_MICB2_RAMP (0x3024) #define WCD938X_RAMP_EN_MASK BIT(7) #define WCD938X_RAMP_SHIFT_CTRL_MASK GENMASK(4, 2)