iio: adc: ti-ads1015: modernize resource management
cover iio: adc: ti-ads1015: modernize resource management
This series modernizes the ti-ads1015 by transitioning it to a fully devm_ architecture.
y moving resource allocation, device registration, and runtime power management to the devm_ infrastructure, the teardown sequence is now guaranteed to execute safely in the reverse order of initialization. This allows for the complete removal of the ads1015_remove() function, eliminating boilerplate code and reducing the risk of future resource leaks.
Additionally, a minor housekeeping patch is included to ensure the header includes remain alphabetically sorted.
Archit Anant (3):
iio: adc: ti-ads1015: sort headers alphabetically
iio: adc: ti-ads1015: use local device pointer in probe
iio: adc: ti-ads1015: convert to fully managed resources
drivers/iio/adc/ti-ads1015.c | 89 +++++++++++++++++------------------- 1 file changed, 42 insertions(+), 47 deletions(-)
Signature · 1 line
2.39.5
PATCH 1/3 iio: adc: ti-ads1015: sort headers alphabetically
Reorder include headers alphabetically to comply with the preferred coding style and improve maintainability.
No functional changes.
--- drivers/iio/adc/ti-ads1015.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/iio/adc/ti-ads1015.c +9 -9
@@ -11,24 +11,24 @@* * 0x4B - ADDR connected to SCL */ -#include <linux/module.h> #include <linux/cleanup.h> +#include <linux/delay.h> +#include <linux/i2c.h> #include <linux/init.h> #include <linux/irq.h> -#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pm_runtime.h> #include <linux/property.h> #include <linux/regmap.h> -#include <linux/pm_runtime.h> -#include <linux/mutex.h> -#include <linux/delay.h> +#include <linux/iio/buffer.h> +#include <linux/iio/events.h> #include <linux/iio/iio.h> -#include <linux/iio/types.h> #include <linux/iio/sysfs.h> -#include <linux/iio/events.h> -#include <linux/iio/buffer.h> -#include <linux/iio/triggered_buffer.h> #include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> +#include <linux/iio/types.h> #define ADS1015_DRV_NAME "ads1015"
Signature · 1 line
2.39.5
PATCH 2/3 iio: adc: ti-ads1015: use local device pointer in probe
In reply to Archit AnantIntroduce a local device pointer 'dev' in ads1015_probe to avoid accessing &client->dev repeatedly.
--- drivers/iio/adc/ti-ads1015.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/iio/adc/ti-ads1015.c +12 -11
@@ -937,12 +937,13 @@ static int ads1015_probe(struct i2c_client *client)struct ads1015_data *data;int ret;int i; +struct device *dev = &client->dev; chip =i2c_get_match_data (client);if (!chip) -return dev_err_probe (&client->dev, -EINVAL ,"Unknown chip\n" ); +return dev_err_probe (dev, -EINVAL ,"Unknown chip\n" ); - indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); + indio_dev =devm_iio_device_alloc (dev,sizeof (*data));if (!indio_dev)return -ENOMEM ;
@@ -978,15 +979,15 @@ static int ads1015_probe(struct i2c_client *client) &ads1015_regmap_config : &tla2024_regmap_config);if (IS_ERR (data->regmap)) { -dev_err (&client->dev,"Failed to allocate register map\n" ); +dev_err (dev,"Failed to allocate register map\n" );return PTR_ERR (data->regmap); } - ret =devm_iio_triggered_buffer_setup (&client->dev, indio_dev,NULL , + ret =devm_iio_triggered_buffer_setup (dev, indio_dev,NULL , ads1015_trigger_handler, &ads1015_buffer_setup_ops);if (ret <0 ) { -dev_err (&client->dev,"iio triggered buffer setup failed\n" ); +dev_err (dev,"iio triggered buffer setup failed\n" );return ret; }
@@ -1018,7 +1019,7 @@ static int ads1015_probe(struct i2c_client *client)if (ret)return ret; - ret =devm_request_threaded_irq (&client->dev, client->irq, + ret =devm_request_threaded_irq (dev, client->irq,NULL , ads1015_event_handler, irq_trig |IRQF_ONESHOT , client->name, indio_dev);
@@ -1032,16 +1033,16 @@ static int ads1015_probe(struct i2c_client *client) data->conv_invalid = true; - ret =pm_runtime_set_active (&client->dev); + ret =pm_runtime_set_active (dev);if (ret)return ret; -pm_runtime_set_autosuspend_delay (&client->dev,ADS1015_SLEEP_DELAY_MS ); -pm_runtime_use_autosuspend (&client->dev); -pm_runtime_enable (&client->dev); +pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); +pm_runtime_use_autosuspend (dev); +pm_runtime_enable (dev); ret =iio_device_register (indio_dev);if (ret <0 ) { -dev_err (&client->dev,"Failed to register IIO device\n" ); +dev_err (dev,"Failed to register IIO device\n" );return ret; }
Signature · 1 line
2.39.5
Re: [PATCH 2/3] iio: adc: ti-ads1015: use local device pointer in probe
Quoted 2 lines · Archit Anant
Introduce a local device pointer 'dev' in
ads1015_probeto avoid accessing&client->devrepeatedly.
...
drivers/iio/adc/ti-ads1015.c static int ads1015_probe(struct i2c_client *client) · line 940
Quoted 6 lines
static int
ads1015_probe(struct i2c_client *client)drivers/iio/adc/ti-ads1015.c +1
-0struct ads1015_data *data;int ret;int i; +struct device *dev = &client->dev;
Preserve reversed xmas tree order.
...
drivers/iio/adc/ti-ads1015.c static int ads1015_probe(struct i2c_client *client) · line 944
Quoted 4 lines
drivers/iio/adc/ti-ads1015.c +1
-1chip =i2c_get_match_data (client);if (!chip) -return dev_err_probe (&client->dev, -EINVAL ,"Unknown chip\n" ); +return dev_err_probe (dev, -EINVAL ,"Unknown chip\n" );
Side note: At some point we probably want to unify the error code for missing driver data to be -ENODATA.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 2/3] iio: adc: ti-ads1015: use local device pointer in probe
In reply to Archit AnantQuoted 29 lines · On Sat, 18 Jul 2026 13:20:15 +0530 Archit Anant <[email protected]> wrote:
Introduce a local device pointer 'dev' in
ads1015_probeto avoid accessing&client->devrepeatedly.Signed-off-by Archit Anant <[email protected]>--- drivers/iio/adc/ti-ads1015.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)drivers/iio/adc/ti-ads1015.c +3
-2@@ -937,12 +937,13 @@ static int ads1015_probe(struct i2c_client *client)struct ads1015_data *data;int ret;int i; +struct device *dev = &client->dev; chip =i2c_get_match_data (client);if (!chip) -return dev_err_probe (&client->dev, -EINVAL ,"Unknown chip\n" ); +return dev_err_probe (dev, -EINVAL ,"Unknown chip\n" ); - indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); + indio_dev =devm_iio_device_alloc (dev,sizeof (*data));if (!indio_dev)return -ENOMEM ;
drivers/iio/adc/ti-ads1015.c static int ads1015_probe(struct i2c_client *client) · line 982
Quoted 5 lines
drivers/iio/adc/ti-ads1015.c +1
-1@@ -978,15 +979,15 @@ static int ads1015_probe(struct i2c_client *client) &ads1015_regmap_config : &tla2024_regmap_config);if (IS_ERR (data->regmap)) { -dev_err (&client->dev,"Failed to allocate register map\n" ); +dev_err (dev,"Failed to allocate register map\n" );
Whilst touching this anyway please switch the cases like this one
1. In probe() or things only called from probe()
2. Return directly after dev_err()
over to return dev_err_probe()
Quoted 44 lines
drivers/iio/adc/ti-ads1015.c +8
-8return PTR_ERR (data->regmap); } - ret =devm_iio_triggered_buffer_setup (&client->dev, indio_dev,NULL , + ret =devm_iio_triggered_buffer_setup (dev, indio_dev,NULL , ads1015_trigger_handler, &ads1015_buffer_setup_ops);if (ret <0 ) { -dev_err (&client->dev,"iio triggered buffer setup failed\n" ); +dev_err (dev,"iio triggered buffer setup failed\n" );return ret; }@@ -1018,7 +1019,7 @@ static int ads1015_probe(struct i2c_client *client)if (ret)return ret; - ret =devm_request_threaded_irq (&client->dev, client->irq, + ret =devm_request_threaded_irq (dev, client->irq,NULL , ads1015_event_handler, irq_trig |IRQF_ONESHOT , client->name, indio_dev);@@ -1032,16 +1033,16 @@ static int ads1015_probe(struct i2c_client *client) data->conv_invalid = true; - ret =pm_runtime_set_active (&client->dev); + ret =pm_runtime_set_active (dev);if (ret)return ret; -pm_runtime_set_autosuspend_delay (&client->dev,ADS1015_SLEEP_DELAY_MS ); -pm_runtime_use_autosuspend (&client->dev); -pm_runtime_enable (&client->dev); +pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); +pm_runtime_use_autosuspend (dev); +pm_runtime_enable (dev); ret =iio_device_register (indio_dev);if (ret <0 ) { -dev_err (&client->dev,"Failed to register IIO device\n" ); +dev_err (dev,"Failed to register IIO device\n" );return ret; }
PATCH 3/3 iio: adc: ti-ads1015: convert to fully managed resources
In reply to Archit AnantRefactor the driver to use devm_ allocations and power management, allowing for the complete removal of the ads1015_remove()
Key changes:
- Use devm_add_action_or_reset() to ensure the ADC is safely powered down upon driver removal.
- Move to devm_pm_runtime_set_active_enabled() to manage the runtime PM lifecycle.
- Update the PM operations to use DEFINE_RUNTIME_DEV_PM_OPS and pm_ptr() for modern compiler saftey.
- Convert iio_device_register() and mutex_init() to their devm_ variants.
- Remove the thus obsolete ads1015_remove() function.
--- drivers/iio/adc/ti-ads1015.c | 58 ++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 32 deletions(-)
drivers/iio/adc/ti-ads1015.c +26 -32
@@ -930,6 +930,14 @@ static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) mode << ADS1015_CFG_MOD_SHIFT); } +static void ads1015_power_off (void *data) +{ +struct ads1015_data *st = data; + +/* power down single shot mode */ +ads1015_set_conv_mode (st,ADS1015_SINGLESHOT ); +} +static int ads1015_probe (struct i2c_client *client) {const struct ads1015_chip_data *chip;
@@ -950,7 +958,9 @@ static int ads1015_probe(struct i2c_client *client) data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); -mutex_init (&data->lock); + ret =devm_mutex_init (dev, &data->lock); +if (ret) +return ret; indio_dev->name =ADS1015_DRV_NAME ; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -1033,38 +1043,23 @@ static int ads1015_probe(struct i2c_client *client) data->conv_invalid = true; - ret =pm_runtime_set_active (dev); + ret =devm_add_action_or_reset (dev, ads1015_power_off, data);if (ret)return ret; -pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); -pm_runtime_use_autosuspend (dev); -pm_runtime_enable (dev); - ret =iio_device_register (indio_dev); -if (ret <0 ) { -dev_err (dev,"Failed to register IIO device\n" ); + ret =devm_pm_runtime_set_active_enabled (dev); +if (ret)return ret; - } -return 0 ; -} - -static void ads1015_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); -struct ads1015_data *data =iio_priv (indio_dev); -int ret; - -iio_device_unregister (indio_dev); - -pm_runtime_disable (&client->dev); -pm_runtime_set_suspended (&client->dev); +pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); +pm_runtime_use_autosuspend (dev); -/* power down single shot mode */ - ret =ads1015_set_conv_mode (data,ADS1015_SINGLESHOT ); + ret =devm_iio_device_register (dev, indio_dev);if (ret) -dev_warn (&client->dev,"Failed to power down (%pe)\n" , -ERR_PTR (ret)); +return dev_err_probe (dev, ret, +"Failed to register IIO device\n" ); + +return 0 ; }#ifdef CONFIG_PM
@@ -1090,10 +1085,10 @@ static int ads1015_runtime_resume(struct device *dev) }#endif -static const struct dev_pm_ops ads1015_pm_ops = { -SET_RUNTIME_PM_OPS (ads1015_runtime_suspend, - ads1015_runtime_resume,NULL ) -}; +static DEFINE_RUNTIME_DEV_PM_OPS(ads1015_pm_ops, + ads1015_runtime_suspend, + ads1015_runtime_resume, + NULL);static const struct ads1015_chip_data ads1015_data = { .channels = ads1015_channels,
@@ -1148,10 +1143,9 @@ static struct i2c_driver ads1015_driver = { .driver = { .name = ADS1015_DRV_NAME, .of_match_table = ads1015_of_match, - .pm = &ads1015_pm_ops, + .pm = pm_ptr(&ads1015_pm_ops), }, .probe = ads1015_probe, - .remove = ads1015_remove, .id_table = ads1015_id, };
Signature · 1 line
2.39.5
Re: [PATCH 3/3] iio: adc: ti-ads1015: convert to fully managed resources
Quoted 14 lines · Archit Anant
Refactor the driver to use
devm_allocations and power management, allowing for the complete removal of theads1015_remove()Key changes:
- Usedevm_add_action_or_reset()to ensure the ADC is safely powered down upon driver removal.
- Move todevm_pm_runtime_set_active_enabled()to manage the runtime PM lifecycle.
- Update the PM operations to useDEFINE_RUNTIME_DEV_PM_OPSandpm_ptr()for modern compiler saftey.
- Convertiio_device_register()andmutex_init()to theirdevm_variants.
- Remove the thus obsoleteads1015_remove()function.
...
drivers/iio/adc/ti-ads1015.c static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) · line 935
Quoted 3 lines
drivers/iio/adc/ti-ads1015.c +3
-0+static void ads1015_power_off (void *data) +{ +struct ads1015_data *st = data;
Unneeded.
drivers/iio/adc/ti-ads1015.c static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) · line 939
Quoted 3 lines
drivers/iio/adc/ti-ads1015.c +3
-0+/* power down single shot mode */ +ads1015_set_conv_mode (st,ADS1015_SINGLESHOT ); +}
/* power down single shot mode */
static void ads1015_power_off(void *st)
{
ads1015_set_conv_mode(st, ADS1015_SINGLESHOT);
}...
Quoted 6 lines
drivers/iio/adc/ti-ads1015.c +2
-4-static const struct dev_pm_ops ads1015_pm_ops = { -SET_RUNTIME_PM_OPS (ads1015_runtime_suspend, - ads1015_runtime_resume,NULL ) -}; +static DEFINE_RUNTIME_DEV_PM_OPS(ads1015_pm_ops, + ads1015_runtime_suspend,
drivers/iio/adc/ti-ads1015.c static int ads1015_runtime_resume(struct device *dev)
Quoted 10 lines
drivers/iio/adc/ti-ads1015.c +3
-1+ ads1015_runtime_resume, + NULL); .driver = { .name = ADS1015_DRV_NAME, .of_match_table = ads1015_of_match, - .pm = &ads1015_pm_ops, + .pm = pm_ptr(&ads1015_pm_ops), },
This should be split to a separate change. Before even patch 1.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 3/3] iio: adc: ti-ads1015: convert to fully managed resources
In reply to Archit AnantQuoted 4 lines · On Sat, 18 Jul 2026 13:20:16 +0530 Archit Anant <[email protected]> wrote:
Refactor the driver to use
devm_allocations and power management, allowing for the complete removal of theads1015_remove()
Quoted 10 lines
Key changes:
- Usedevm_add_action_or_reset()to ensure the ADC is safely powered down upon driver removal.
- Move todevm_pm_runtime_set_active_enabled()to manage the runtime PM lifecycle.
- Update the PM operations to useDEFINE_RUNTIME_DEV_PM_OPSandpm_ptr()for modern compiler saftey.
- Convertiio_device_register()andmutex_init()to theirdevm_variants.
- Remove the thus obsoleteads1015_remove()function.
See below. I'm fairly sure this is also fixing a bug. Ideally you'd fix that first at the start of the series then refactor it later.
Jonathan
Quoted 44 lines
Signed-off-by Archit Anant <[email protected]>--- drivers/iio/adc/ti-ads1015.c | 58 ++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 32 deletions(-)drivers/iio/adc/ti-ads1015.c +12
-2@@ -930,6 +930,14 @@ static int ads1015_set_conv_mode(struct ads1015_data *data, int mode) mode << ADS1015_CFG_MOD_SHIFT); } +static void ads1015_power_off (void *data) +{ +struct ads1015_data *st = data; + +/* power down single shot mode */ +ads1015_set_conv_mode (st,ADS1015_SINGLESHOT ); +} +static int ads1015_probe (struct i2c_client *client) {const struct ads1015_chip_data *chip;@@ -950,7 +958,9 @@ static int ads1015_probe(struct i2c_client *client) data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); -mutex_init (&data->lock); + ret =devm_mutex_init (dev, &data->lock); +if (ret) +return ret; indio_dev->name =ADS1015_DRV_NAME ; indio_dev->modes =INDIO_DIRECT_MODE ;@@ -1033,38 +1043,23 @@ static int ads1015_probe(struct i2c_client *client) data->conv_invalid = true; - ret =pm_runtime_set_active (dev); + ret =devm_add_action_or_reset (dev, ads1015_power_off, data);if (ret)return ret;
drivers/iio/adc/ti-ads1015.c static int ads1015_probe(struct i2c_client *client) · line 1052
Quoted 10 lines
drivers/iio/adc/ti-ads1015.c +2
-6-pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); -pm_runtime_use_autosuspend (dev); -pm_runtime_enable (dev); - ret =iio_device_register (indio_dev); -if (ret <0 ) { -dev_err (dev,"Failed to register IIO device\n" ); + ret =devm_pm_runtime_set_active_enabled (dev); +if (ret)return ret;
Worth noting this was a bug as noting turned off the runtime pm if we got an error in iio_device_register(). That is fixed by this patch I think.
Quoted 32 lines
drivers/iio/adc/ti-ads1015.c +7
-18- } -return 0 ; -} - -static void ads1015_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); -struct ads1015_data *data =iio_priv (indio_dev); -int ret; - -iio_device_unregister (indio_dev); - -pm_runtime_disable (&client->dev); -pm_runtime_set_suspended (&client->dev); +pm_runtime_set_autosuspend_delay (dev,ADS1015_SLEEP_DELAY_MS ); +pm_runtime_use_autosuspend (dev); -/* power down single shot mode */ - ret =ads1015_set_conv_mode (data,ADS1015_SINGLESHOT ); + ret =devm_iio_device_register (dev, indio_dev);if (ret) -dev_warn (&client->dev,"Failed to power down (%pe)\n" , -ERR_PTR (ret)); +return dev_err_probe (dev, ret, +"Failed to register IIO device\n" ); + +return 0 ; }#ifdef CONFIG_PM
drivers/iio/adc/ti-ads1015.c static int ads1015_runtime_resume(struct device *dev) · line 1088
Quoted 8 lines
drivers/iio/adc/ti-ads1015.c +1
-4@@ -1090,10 +1085,10 @@ static int ads1015_runtime_resume(struct device *dev) }#endif -static const struct dev_pm_ops ads1015_pm_ops = { -SET_RUNTIME_PM_OPS (ads1015_runtime_suspend, - ads1015_runtime_resume,NULL ) -}; +static DEFINE_RUNTIME_DEV_PM_OPS(ads1015_pm_ops,
Sashiko points this out. Switching to this and leaving the CONFIG_PM ifdef above is a bug.
https://sashiko.dev/#/patchset/20260718075016.27750-1-architanant5%40gmail.com
I didn't chase through whether you can also safely remove the other one further up in the code.
Quoted 18 lines
drivers/iio/adc/ti-ads1015.c +4
-2+ ads1015_runtime_suspend, + ads1015_runtime_resume, + NULL);static const struct ads1015_chip_data ads1015_data = { .channels = ads1015_channels,@@ -1148,10 +1143,9 @@ static struct i2c_driver ads1015_driver = { .driver = { .name = ADS1015_DRV_NAME, .of_match_table = ads1015_of_match, - .pm = &ads1015_pm_ops, + .pm = pm_ptr(&ads1015_pm_ops), }, .probe = ads1015_probe, - .remove = ads1015_remove, .id_table = ads1015_id, };