ASoC: codecs: wcd939x: Simplify with devm_regulator_bulk_get_enable()

Drop separate regulator get and enable in probe() path with
devm_regulator_bulk_get_enable(), which simplifies cleanup paths and
device remove().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250526-b4-asoc-wcd9395-vdd-px-v1-3-64d3cb60313b@linaro.org
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c
index 067d23c7ecf90ae06da1ad6cc89d273fb7f7f875..95cd88a37acb5ef455d4a40948284ae45e2dfb28 100644 (file)
--- a/sound/soc/codecs/wcd939x.c
+++ b/sound/soc/codecs/wcd939x.c
@@ -32,7 +32,6 @@
 #include "wcd939x.h"
 
 #define WCD939X_MAX_MICBIAS            (4)
-#define WCD939X_MAX_SUPPLY             (4)
 #define WCD939X_MBHC_MAX_BUTTONS       (8)
 #define TX_ADC_MAX                     (4)
 #define WCD_MBHC_HS_V_MAX              1600
@@ -192,7 +191,6 @@ struct wcd939x_priv {
        struct irq_domain *virq;
        struct regmap_irq_chip *wcd_regmap_irq_chip;
        struct regmap_irq_chip_data *irq_chip;
-       struct regulator_bulk_data supplies[WCD939X_MAX_SUPPLY];
        struct snd_soc_jack *jack;
        unsigned long status_mask;
        s32 micb_ref[WCD939X_MAX_MICBIAS];
@@ -213,6 +211,10 @@ struct wcd939x_priv {
        bool ldoh;
 };
 
+static const char * const wcd939x_supplies[] = {
+       "vdd-rxtx", "vdd-io", "vdd-buck", "vdd-mic-bias",
+};
+
 static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(ear_pa_gain, 600, -1800);
 static const DECLARE_TLV_DB_SCALE(line_gain, 0, 7, 1);
 static const DECLARE_TLV_DB_SCALE(analog_gain, 0, 25, 1);
@@ -3244,20 +3246,10 @@ static int wcd939x_populate_dt_data(struct wcd939x_priv *wcd939x, struct device
                return dev_err_probe(dev, ret, "Failed to get reset gpio\n");
        }
 
-       wcd939x->supplies[0].supply = "vdd-rxtx";
-       wcd939x->supplies[1].supply = "vdd-io";
-       wcd939x->supplies[2].supply = "vdd-buck";
-       wcd939x->supplies[3].supply = "vdd-mic-bias";
-
-       ret = regulator_bulk_get(dev, WCD939X_MAX_SUPPLY, wcd939x->supplies);
+       ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(wcd939x_supplies),
+                                            wcd939x_supplies);
        if (ret)
-               return dev_err_probe(dev, ret, "Failed to get supplies\n");
-
-       ret = regulator_bulk_enable(WCD939X_MAX_SUPPLY, wcd939x->supplies);
-       if (ret) {
-               regulator_bulk_free(WCD939X_MAX_SUPPLY, wcd939x->supplies);
-               return dev_err_probe(dev, ret, "Failed to enable supplies\n");
-       }
+               return dev_err_probe(dev, ret, "Failed to get and enable supplies\n");
 
        wcd939x_dt_parse_micbias_info(dev, wcd939x);
 
@@ -3629,17 +3621,17 @@ static int wcd939x_probe(struct platform_device *pdev)
 
        ret = wcd939x_add_typec(wcd939x, dev);
        if (ret)
-               goto err_disable_regulators;
+               return ret;
 
        ret = wcd939x_add_slave_components(wcd939x, dev, &match);
        if (ret)
-               goto err_disable_regulators;
+               return ret;
 
        wcd939x_reset(wcd939x);
 
        ret = component_master_add_with_match(dev, &wcd939x_comp_ops, match);
        if (ret)
-               goto err_disable_regulators;
+               return ret;
 
        pm_runtime_set_autosuspend_delay(dev, 1000);
        pm_runtime_use_autosuspend(dev);
@@ -3649,27 +3641,17 @@ static int wcd939x_probe(struct platform_device *pdev)
        pm_runtime_idle(dev);
 
        return 0;
-
-err_disable_regulators:
-       regulator_bulk_disable(WCD939X_MAX_SUPPLY, wcd939x->supplies);
-       regulator_bulk_free(WCD939X_MAX_SUPPLY, wcd939x->supplies);
-
-       return ret;
 }
 
 static void wcd939x_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct wcd939x_priv *wcd939x = dev_get_drvdata(dev);
 
        component_master_del(dev, &wcd939x_comp_ops);
 
        pm_runtime_disable(dev);
        pm_runtime_set_suspended(dev);
        pm_runtime_dont_use_autosuspend(dev);
-
-       regulator_bulk_disable(WCD939X_MAX_SUPPLY, wcd939x->supplies);
-       regulator_bulk_free(WCD939X_MAX_SUPPLY, wcd939x->supplies);
 }
 
 #if defined(CONFIG_OF)