Skip to content

Commit df94df7

Browse files
aldocontelkjic23
authored andcommitted
iio: tcs3472: use devm for resource management
Convert the driver to use device-managed resource allocation: - Add tcs3472_powerdown_action() and register it with devm_add_action_or_reset() to ensure the device is powered down on cleanup. - Replace iio_triggered_buffer_setup() with devm_iio_triggered_buffer_setup(). - Replace request_threaded_irq() with devm_request_threaded_irq(). - Replace iio_device_register() with devm_iio_device_register(). - Replace mutex_init() with devm_mutex_init(). - Remove tcs3472_remove() as all cleanup is now handled by devm. Use a local 'dev = &client->dev' in tcs3472_probe() to keep the devm calls compact. Signed-off-by: Aldo Conte <aldocontelk@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
1 parent 2e84e69 commit df94df7

1 file changed

Lines changed: 26 additions & 37 deletions

File tree

drivers/iio/light/tcs3472.c

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/delay.h>
1818
#include <linux/i2c.h>
1919
#include <linux/module.h>
20+
#include <linux/mutex.h>
2021
#include <linux/pm.h>
2122

2223
#include <linux/iio/buffer.h>
@@ -445,20 +446,28 @@ static int tcs3472_powerdown(struct tcs3472_data *data)
445446
return 0;
446447
}
447448

449+
static void tcs3472_powerdown_action(void *data)
450+
{
451+
tcs3472_powerdown(data);
452+
}
453+
448454
static int tcs3472_probe(struct i2c_client *client)
449455
{
456+
struct device *dev = &client->dev;
450457
struct tcs3472_data *data;
451458
struct iio_dev *indio_dev;
452459
int ret;
453460

454-
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
461+
indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
455462
if (!indio_dev)
456463
return -ENOMEM;
457464

458465
data = iio_priv(indio_dev);
459466
i2c_set_clientdata(client, indio_dev);
460467
data->client = client;
461-
mutex_init(&data->lock);
468+
ret = devm_mutex_init(dev, &data->lock);
469+
if (ret)
470+
return ret;
462471

463472
indio_dev->info = &tcs3472_info;
464473
indio_dev->name = TCS3472_DRV_NAME;
@@ -515,46 +524,27 @@ static int tcs3472_probe(struct i2c_client *client)
515524
if (ret < 0)
516525
return ret;
517526

518-
ret = iio_triggered_buffer_setup(indio_dev, NULL,
519-
tcs3472_trigger_handler, NULL);
527+
ret = devm_add_action_or_reset(dev, tcs3472_powerdown_action, data);
528+
if (ret)
529+
return ret;
530+
531+
ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
532+
tcs3472_trigger_handler, NULL);
520533
if (ret < 0)
521-
goto error_powerdown;
534+
return ret;
522535

523536
if (client->irq) {
524-
ret = request_threaded_irq(client->irq, NULL,
525-
tcs3472_event_handler,
526-
IRQF_TRIGGER_FALLING | IRQF_SHARED |
527-
IRQF_ONESHOT,
528-
client->name, indio_dev);
537+
ret = devm_request_threaded_irq(dev, client->irq, NULL,
538+
tcs3472_event_handler,
539+
IRQF_TRIGGER_FALLING |
540+
IRQF_SHARED |
541+
IRQF_ONESHOT,
542+
client->name, indio_dev);
529543
if (ret)
530-
goto buffer_cleanup;
544+
return ret;
531545
}
532546

533-
ret = iio_device_register(indio_dev);
534-
if (ret < 0)
535-
goto free_irq;
536-
537-
return 0;
538-
539-
free_irq:
540-
if (client->irq)
541-
free_irq(client->irq, indio_dev);
542-
buffer_cleanup:
543-
iio_triggered_buffer_cleanup(indio_dev);
544-
error_powerdown:
545-
tcs3472_powerdown(data);
546-
return ret;
547-
}
548-
549-
static void tcs3472_remove(struct i2c_client *client)
550-
{
551-
struct iio_dev *indio_dev = i2c_get_clientdata(client);
552-
553-
iio_device_unregister(indio_dev);
554-
if (client->irq)
555-
free_irq(client->irq, indio_dev);
556-
iio_triggered_buffer_cleanup(indio_dev);
557-
tcs3472_powerdown(iio_priv(indio_dev));
547+
return devm_iio_device_register(dev, indio_dev);
558548
}
559549

560550
static int tcs3472_suspend(struct device *dev)
@@ -598,7 +588,6 @@ static struct i2c_driver tcs3472_driver = {
598588
.pm = pm_sleep_ptr(&tcs3472_pm_ops),
599589
},
600590
.probe = tcs3472_probe,
601-
.remove = tcs3472_remove,
602591
.id_table = tcs3472_id,
603592
};
604593
module_i2c_driver(tcs3472_driver);

0 commit comments

Comments
 (0)