[PATCH v3 2/3] ASoC: codecs: wsa883x: Add devm action to safely disable regulator on device removal
From: Mohammad Rafi Shaik <hidden>
Date: 2025-07-27 08:31:56
Also in:
linux-arm-msm, linux-gpio, linux-sound, lkml
Subsystem:
qcom audio (asoc) drivers, sound, sound - soc layer / dynamic audio power management (asoc), the rest · Maintainers:
Srinivas Kandagatla, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds
To prevent potential warnings from _regulator_put() during device removal, register a devm-managed cleanup action using devm_add_action_or_reset() to safely disable the regulator associated with the WSA883x codec, ensuring that the regulator is properly disabled when the device is removed, even if the probe fails or the driver is unloaded unexpectedly. Signed-off-by: Mohammad Rafi Shaik <redacted> --- sound/soc/codecs/wsa883x.c | 44 ++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c
index 188363b03b93..d5bc71b28a3a 100644
--- a/sound/soc/codecs/wsa883x.c
+++ b/sound/soc/codecs/wsa883x.c@@ -14,6 +14,7 @@ #include <linux/printk.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include <linux/reset.h> #include <linux/slab.h> #include <linux/soundwire/sdw.h> #include <linux/soundwire/sdw_registers.h>
@@ -1546,6 +1547,13 @@ static const struct hwmon_chip_info wsa883x_hwmon_chip_info = { .info = wsa883x_hwmon_info, }; +static void wsa883x_regulator_disable(void *data) +{ + struct wsa883x_priv *wsa883x = data; + + regulator_disable(wsa883x->vdd); +} + static int wsa883x_probe(struct sdw_slave *pdev, const struct sdw_device_id *id) {
@@ -1566,13 +1574,20 @@ static int wsa883x_probe(struct sdw_slave *pdev, if (ret) return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n"); + /* + * Register devm action to safely disable the regulator on device removal. + * This prevents a potential release warning from _regulator_put(). + */ + ret = devm_add_action_or_reset(dev, wsa883x_regulator_disable, + wsa883x); + if (ret) + return ret; + wsa883x->sd_n = devm_gpiod_get_optional(dev, "powerdown", GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH); - if (IS_ERR(wsa883x->sd_n)) { - ret = dev_err_probe(dev, PTR_ERR(wsa883x->sd_n), - "Shutdown Control GPIO not found\n"); - goto err; - } + if (IS_ERR(wsa883x->sd_n)) + return dev_err_probe(dev, PTR_ERR(wsa883x->sd_n), + "Shutdown Control GPIO not found\n"); dev_set_drvdata(dev, wsa883x); wsa883x->slave = pdev;
@@ -1598,12 +1613,9 @@ static int wsa883x_probe(struct sdw_slave *pdev, gpiod_direction_output(wsa883x->sd_n, 0); wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config); - if (IS_ERR(wsa883x->regmap)) { - gpiod_direction_output(wsa883x->sd_n, 1); - ret = dev_err_probe(dev, PTR_ERR(wsa883x->regmap), - "regmap_init failed\n"); - goto err; - } + if (IS_ERR(wsa883x->regmap)) + return dev_err_probe(dev, PTR_ERR(wsa883x->regmap), + "regmap_init failed\n"); if (IS_REACHABLE(CONFIG_HWMON)) { struct device *hwmon;
@@ -1623,16 +1635,10 @@ static int wsa883x_probe(struct sdw_slave *pdev, pm_runtime_set_active(dev); pm_runtime_enable(dev); - ret = devm_snd_soc_register_component(dev, - &wsa883x_component_drv, + return devm_snd_soc_register_component(dev, + &wsa883x_component_drv, wsa883x_dais, ARRAY_SIZE(wsa883x_dais)); -err: - if (ret) - regulator_disable(wsa883x->vdd); - - return ret; - } static int wsa883x_runtime_suspend(struct device *dev)
--
2.34.1