github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240123140918.215818-1-afd@ti.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Andrew Davis 2024-01-23 08:09:15 -06:00 committed by Jonathan Cameron
parent e21b4321f9
commit eeb4c24a5c
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/iio/health/afe4403.c
View File

@ -346,6 +346,13 @@ static irqreturn_t afe4403_trigger_handler(int irq, void *private)
return IRQ_HANDLED;
}
static void afe4403_regulator_disable(void *data)
{
struct regulator *regulator = data;
regulator_disable(regulator);
}
#define AFE4403_TIMING_PAIRS \
{ AFE440X_LED2STC, 0x000050 }, \
{ AFE440X_LED2ENDC, 0x0003e7 }, \
@ -495,19 +502,24 @@ static int afe4403_probe(struct spi_device *spi)
dev_err(afe->dev, "Unable to enable regulator\n");
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,
AFE440X_CONTROL0_SW_RESET);
if (ret) {
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,
ARRAY_SIZE(afe4403_reg_sequences));
if (ret) {
dev_err(afe->dev, "Unable to set register defaults\n");
goto err_disable_reg;
return ret;
}
indio_dev->modes = INDIO_DIRECT_MODE;
@ -523,8 +535,7 @@ static int afe4403_probe(struct spi_device *spi)
iio_device_id(indio_dev));
if (!afe->trig) {
dev_err(afe->dev, "Unable to allocate IIO trigger\n");
ret = -ENOMEM;
goto err_disable_reg;
return -ENOMEM;
}
iio_trigger_set_drvdata(afe->trig, indio_dev);
@ -532,7 +543,7 @@ static int afe4403_probe(struct spi_device *spi)
ret = iio_trigger_register(afe->trig);
if (ret) {
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,
@ -566,8 +577,6 @@ static int afe4403_probe(struct spi_device *spi)
err_trig:
if (afe->irq > 0)
iio_trigger_unregister(afe->trig);
err_disable_reg:
regulator_disable(afe->regulator);
return ret;
}
@ -584,10 +593,6 @@ static void afe4403_remove(struct spi_device *spi)
if (afe->irq > 0)
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[] = {