ASoC: codecs: wcd934x: Drop unused mic bias voltage fields

Driver stores the voltage of mic bias in fields in state container
structure, but actually never reads them - except for the mic2 bias
(micb2_mv field).  Drop the fields from the structure so the code will
be a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240612-asoc-wcd9xxx-wide-cleanups-v1-9-0d15885b2a06@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index 7885aa4238866045b729745f0ab450abb32ab510..2a5fb4370ba3e47c8310c40d59afe226f66f7044 100644 (file)
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -566,10 +566,7 @@ struct wcd934x_codec {
        struct mutex micb_lock;
        u32 micb_ref[WCD934X_MAX_MICBIAS];
        u32 pullup_ref[WCD934X_MAX_MICBIAS];
-       u32 micb1_mv;
        u32 micb2_mv;
-       u32 micb3_mv;
-       u32 micb4_mv;
 };
 
 #define to_wcd934x_codec(_hw) container_of(_hw, struct wcd934x_codec, hw)
@@ -2203,7 +2200,8 @@ static int wcd934x_get_micbias_val(struct device *dev, const char *micbias,
                mv = WCD934X_DEF_MICBIAS_MV;
        }
 
-       *micb_mv = mv;
+       if (micb_mv)
+               *micb_mv = mv;
 
        return (mv - 1000) / 50;
 }
@@ -2215,17 +2213,14 @@ static int wcd934x_init_dmic(struct snd_soc_component *comp)
        u32 def_dmic_rate, dmic_clk_drv;
 
        vout_ctl_1 = wcd934x_get_micbias_val(comp->dev,
-                                            "qcom,micbias1-microvolt",
-                                            &wcd->micb1_mv);
+                                            "qcom,micbias1-microvolt", NULL);
        vout_ctl_2 = wcd934x_get_micbias_val(comp->dev,
                                             "qcom,micbias2-microvolt",
                                             &wcd->micb2_mv);
        vout_ctl_3 = wcd934x_get_micbias_val(comp->dev,
-                                            "qcom,micbias3-microvolt",
-                                            &wcd->micb3_mv);
+                                            "qcom,micbias3-microvolt", NULL);
        vout_ctl_4 = wcd934x_get_micbias_val(comp->dev,
-                                            "qcom,micbias4-microvolt",
-                                            &wcd->micb4_mv);
+                                            "qcom,micbias4-microvolt", NULL);
 
        snd_soc_component_update_bits(comp, WCD934X_ANA_MICB1,
                                      WCD934X_MICB_VAL_MASK, vout_ctl_1);