Commit eeb4c24a authored by Andrew Davis's avatar Andrew Davis Committed by Jonathan Cameron

iio: health: afe4403: Use devm action helper for regulator disable

Use a device lifecycle managed action for regulator disable function.
This helps prevent mistakes like unregistering out of order in cleanup
functions and forgetting to unregister on error paths.
Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240123140918.215818-1-afd@ti.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e21b4321
...@@ -346,6 +346,13 @@ static irqreturn_t afe4403_trigger_handler(int irq, void *private) ...@@ -346,6 +346,13 @@ static irqreturn_t afe4403_trigger_handler(int irq, void *private)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void afe4403_regulator_disable(void *data)
{
struct regulator *regulator = data;
regulator_disable(regulator);
}
#define AFE4403_TIMING_PAIRS \ #define AFE4403_TIMING_PAIRS \
{ AFE440X_LED2STC, 0x000050 }, \ { AFE440X_LED2STC, 0x000050 }, \
{ AFE440X_LED2ENDC, 0x0003e7 }, \ { AFE440X_LED2ENDC, 0x0003e7 }, \
...@@ -495,19 +502,24 @@ static int afe4403_probe(struct spi_device *spi) ...@@ -495,19 +502,24 @@ static int afe4403_probe(struct spi_device *spi)
dev_err(afe->dev, "Unable to enable regulator\n"); dev_err(afe->dev, "Unable to enable regulator\n");
return ret; return ret;
} }
ret = devm_add_action_or_reset(afe->dev, afe4403_regulator_disable, afe->regulator);
if (ret) {
dev_err(afe->dev, "Unable to add regulator disable action\n");
return ret;
}
ret = regmap_write(afe->regmap, AFE440X_CONTROL0, ret = regmap_write(afe->regmap, AFE440X_CONTROL0,
AFE440X_CONTROL0_SW_RESET); AFE440X_CONTROL0_SW_RESET);
if (ret) { if (ret) {
dev_err(afe->dev, "Unable to reset device\n"); dev_err(afe->dev, "Unable to reset device\n");
goto err_disable_reg; return ret;
} }
ret = regmap_multi_reg_write(afe->regmap, afe4403_reg_sequences, ret = regmap_multi_reg_write(afe->regmap, afe4403_reg_sequences,
ARRAY_SIZE(afe4403_reg_sequences)); ARRAY_SIZE(afe4403_reg_sequences));
if (ret) { if (ret) {
dev_err(afe->dev, "Unable to set register defaults\n"); dev_err(afe->dev, "Unable to set register defaults\n");
goto err_disable_reg; return ret;
} }
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
...@@ -523,8 +535,7 @@ static int afe4403_probe(struct spi_device *spi) ...@@ -523,8 +535,7 @@ static int afe4403_probe(struct spi_device *spi)
iio_device_id(indio_dev)); iio_device_id(indio_dev));
if (!afe->trig) { if (!afe->trig) {
dev_err(afe->dev, "Unable to allocate IIO trigger\n"); dev_err(afe->dev, "Unable to allocate IIO trigger\n");
ret = -ENOMEM; return -ENOMEM;
goto err_disable_reg;
} }
iio_trigger_set_drvdata(afe->trig, indio_dev); iio_trigger_set_drvdata(afe->trig, indio_dev);
...@@ -532,7 +543,7 @@ static int afe4403_probe(struct spi_device *spi) ...@@ -532,7 +543,7 @@ static int afe4403_probe(struct spi_device *spi)
ret = iio_trigger_register(afe->trig); ret = iio_trigger_register(afe->trig);
if (ret) { if (ret) {
dev_err(afe->dev, "Unable to register IIO trigger\n"); dev_err(afe->dev, "Unable to register IIO trigger\n");
goto err_disable_reg; return ret;
} }
ret = devm_request_threaded_irq(afe->dev, afe->irq, ret = devm_request_threaded_irq(afe->dev, afe->irq,
...@@ -566,8 +577,6 @@ static int afe4403_probe(struct spi_device *spi) ...@@ -566,8 +577,6 @@ static int afe4403_probe(struct spi_device *spi)
err_trig: err_trig:
if (afe->irq > 0) if (afe->irq > 0)
iio_trigger_unregister(afe->trig); iio_trigger_unregister(afe->trig);
err_disable_reg:
regulator_disable(afe->regulator);
return ret; return ret;
} }
...@@ -584,10 +593,6 @@ static void afe4403_remove(struct spi_device *spi) ...@@ -584,10 +593,6 @@ static void afe4403_remove(struct spi_device *spi)
if (afe->irq > 0) if (afe->irq > 0)
iio_trigger_unregister(afe->trig); iio_trigger_unregister(afe->trig);
ret = regulator_disable(afe->regulator);
if (ret)
dev_warn(afe->dev, "Unable to disable regulator\n");
} }
static const struct spi_device_id afe4403_ids[] = { static const struct spi_device_id afe4403_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment