iio: health: afe4403: Use devm action helper for regulator disable
PATCH 1/4 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.
--- drivers/iio/health/afe4403.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
drivers/iio/health/afe4403.c +16 -11
@@ -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[] = {
Signature · 1 line
2.39.2
PATCH 2/4 iio: health: afe4403: Use devm IIO helpers
Use a device lifecycle managed IIO helper functions. This helps prevent mistakes like unregistering and freeing out of order in cleanup functions and forgetting to unregister and free on error paths.
--- drivers/iio/health/afe4403.c | 38 ++++++++---------------------------- 1 file changed, 8 insertions(+), 30 deletions(-)
drivers/iio/health/afe4403.c +8 -30
@@ -540,7 +540,7 @@ static int afe4403_probe(struct spi_device *spi)iio_trigger_set_drvdata (afe->trig, indio_dev); - ret =iio_trigger_register (afe->trig); + ret =devm_iio_trigger_register (afe->dev, afe->trig);if (ret) {dev_err (afe->dev,"Unable to register IIO trigger\n" );return ret;
@@ -553,46 +553,25 @@ static int afe4403_probe(struct spi_device *spi) afe->trig);if (ret) {dev_err (afe->dev,"Unable to request IRQ\n" ); - goto err_trig; +return ret; } } - ret =iio_triggered_buffer_setup (indio_dev, &iio_pollfunc_store_time, - afe4403_trigger_handler,NULL ); + ret =devm_iio_triggered_buffer_setup (afe->dev, indio_dev, + &iio_pollfunc_store_time, + afe4403_trigger_handler,NULL );if (ret) {dev_err (afe->dev,"Unable to setup buffer\n" ); - goto err_trig; +return ret; } - ret =iio_device_register (indio_dev); + ret =devm_iio_device_register (afe->dev, indio_dev);if (ret) {dev_err (afe->dev,"Unable to register IIO device\n" ); - goto err_buff; +return ret; }return 0 ; - -err_buff: -iio_triggered_buffer_cleanup (indio_dev); -err_trig: -if (afe->irq >0 ) -iio_trigger_unregister (afe->trig); - -return ret; -} - -static void afe4403_remove (struct spi_device *spi) -{ -struct iio_dev *indio_dev =spi_get_drvdata (spi); -struct afe4403_data *afe =iio_priv (indio_dev); -int ret; - -iio_device_unregister (indio_dev); - -iio_triggered_buffer_cleanup (indio_dev); - -if (afe->irq >0 ) -iio_trigger_unregister (afe->trig); }static const struct spi_device_id afe4403_ids[] = {
@@ -608,7 +587,6 @@ static struct spi_driver afe4403_spi_driver = { .pm = pm_sleep_ptr(&afe4403_pm_ops), }, .probe = afe4403_probe, - .remove = afe4403_remove, .id_table = afe4403_ids, };module_spi_driver (afe4403_spi_driver);
Signature · 1 line
2.39.2
PATCH 3/4 iio: health: afe4404: Use devm action helper for regulator disable
In reply to Andrew DavisUse 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.
--- drivers/iio/health/afe4404.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/iio/health/afe4404.c +17 -12
@@ -349,6 +349,13 @@ static irqreturn_t afe4404_trigger_handler(int irq, void *private)return IRQ_HANDLED ; } +static void afe4404_regulator_disable (void *data) +{ +struct regulator *regulator = data; + +regulator_disable (regulator); +} +/* Default timings from data-sheet */ #define AFE4404_TIMING_PAIRS \ { AFE440X_PRPCOUNT, 39999 }, \
@@ -502,19 +509,24 @@ static int afe4404_probe(struct i2c_client *client)dev_err (afe->dev,"Unable to enable regulator\n" );return ret; } + ret =devm_add_action_or_reset (afe->dev, afe4404_regulator_disable, afe->regulator); +if (ret) { +dev_err (afe->dev,"Unable to enable regulator\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 disable_reg; +return ret; } ret =regmap_multi_reg_write (afe->regmap, afe4404_reg_sequences,ARRAY_SIZE (afe4404_reg_sequences));if (ret) {dev_err (afe->dev,"Unable to set register defaults\n" ); - goto disable_reg; +return ret; } indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -530,8 +542,7 @@ static int afe4404_probe(struct i2c_client *client) iio_device_id(indio_dev));if (!afe->trig) {dev_err (afe->dev,"Unable to allocate IIO trigger\n" ); - ret = -ENOMEM ; - goto disable_reg; +return -ENOMEM ; }iio_trigger_set_drvdata (afe->trig, indio_dev);
@@ -539,7 +550,7 @@ static int afe4404_probe(struct i2c_client *client) ret =iio_trigger_register (afe->trig);if (ret) {dev_err (afe->dev,"Unable to register IIO trigger\n" ); - goto disable_reg; +return ret; } ret = devm_request_threaded_irq(afe->dev, afe->irq,
@@ -549,7 +560,7 @@ static int afe4404_probe(struct i2c_client *client) afe->trig);if (ret) {dev_err (afe->dev,"Unable to request IRQ\n" ); - goto disable_reg; +return ret; } }
@@ -573,8 +584,6 @@ static int afe4404_probe(struct i2c_client *client) unregister_trigger:if (afe->irq >0 )iio_trigger_unregister (afe->trig); -disable_reg: -regulator_disable (afe->regulator);return ret; }
@@ -591,10 +600,6 @@ static void afe4404_remove(struct i2c_client *client)if (afe->irq >0 )iio_trigger_unregister (afe->trig); - - ret =regulator_disable (afe->regulator); -if (ret) -dev_err (afe->dev,"Unable to disable regulator\n" ); }static const struct i2c_device_id afe4404_ids[] = {
Signature · 1 line
2.39.2
PATCH 4/4 iio: health: afe4404: Use devm IIO helpers
In reply to Andrew DavisUse a device lifecycle managed IIO helper functions. This helps prevent mistakes like unregistering and freeing out of order in cleanup functions and forgetting to unregister and free on error paths.
--- drivers/iio/health/afe4404.c | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-)
drivers/iio/health/afe4404.c +7 -29
@@ -547,7 +547,7 @@ static int afe4404_probe(struct i2c_client *client)iio_trigger_set_drvdata (afe->trig, indio_dev); - ret =iio_trigger_register (afe->trig); + ret =devm_iio_trigger_register (afe->dev, afe->trig);if (ret) {dev_err (afe->dev,"Unable to register IIO trigger\n" );return ret;
@@ -564,42 +564,21 @@ static int afe4404_probe(struct i2c_client *client) } } - ret =iio_triggered_buffer_setup (indio_dev, &iio_pollfunc_store_time, - afe4404_trigger_handler,NULL ); + ret =devm_iio_triggered_buffer_setup (afe->dev, indio_dev, + &iio_pollfunc_store_time, + afe4404_trigger_handler,NULL );if (ret) {dev_err (afe->dev,"Unable to setup buffer\n" ); - goto unregister_trigger; +return ret; } - ret =iio_device_register (indio_dev); + ret =devm_iio_device_register (afe->dev, indio_dev);if (ret) {dev_err (afe->dev,"Unable to register IIO device\n" ); - goto unregister_triggered_buffer; +return ret; }return 0 ; - -unregister_triggered_buffer: -iio_triggered_buffer_cleanup (indio_dev); -unregister_trigger: -if (afe->irq >0 ) -iio_trigger_unregister (afe->trig); - -return ret; -} - -static void afe4404_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); -struct afe4404_data *afe =iio_priv (indio_dev); -int ret; - -iio_device_unregister (indio_dev); - -iio_triggered_buffer_cleanup (indio_dev); - -if (afe->irq >0 ) -iio_trigger_unregister (afe->trig); }static const struct i2c_device_id afe4404_ids[] = {
@@ -615,7 +594,6 @@ static struct i2c_driver afe4404_i2c_driver = { .pm = pm_sleep_ptr(&afe4404_pm_ops), }, .probe = afe4404_probe, - .remove = afe4404_remove, .id_table = afe4404_ids, };module_i2c_driver (afe4404_i2c_driver);
Signature · 1 line
2.39.2
Jonathan Cameron
maintainerQuoted 5 lines · On Tue, 23 Jan 2024 08:09:15 -0600 Andrew Davis <[email protected]> wrote:
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 <[email protected]>
Hi Andrew,
All applied.
You could make use of dev_err_probe() as well to save a few lines if you want to (as a follow up patch).
Thanks,
Jonathan