mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-11 10:23:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

iio: light: opt3001: switch driver to managed resources

Browse Source 
Move the driver to use devm_* functions to automate resource
management and simplify error handling. This also allows removal
of the opt3001_remove() function.

Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Joshua Crofts
2026-06-14 15:19:09 +02:00
committed by Jonathan Cameron
parent 1bff00e98c
commit a4e80b835f
1 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/iio/light/opt3001.c
View File

@@ -705,6 +705,30 @@ static int opt3001_read_id(struct opt3001 *opt)
return 0;
}
static void opt3001_power_off(void *data)
{
struct opt3001 *opt = data;
struct i2c_client *client = opt->client;
struct device *dev = &client->dev;
u16 reg_val;
int ret;
ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_CONFIGURATION);
return;
}
reg_val = ret;
opt3001_set_mode(opt, &reg_val, OPT3001_CONFIGURATION_M_SHUTDOWN);
ret = i2c_smbus_write_word_swapped(client, OPT3001_CONFIGURATION, reg_val);
if (ret < 0)
dev_err(dev, "failed to write to register %02x\n",
OPT3001_CONFIGURATION);
}
static int opt3001_configure(struct opt3001 *opt)
{
struct i2c_client *client = opt->client;
@@ -743,6 +767,11 @@ static int opt3001_configure(struct opt3001 *opt)
return dev_err_probe(dev, ret, "failed to write register %02x\n",
OPT3001_CONFIGURATION);
ret = devm_add_action_or_reset(dev, opt3001_power_off, opt);
if (ret)
return dev_err_probe(dev, ret,
"failed to register power off function\n");
ret = i2c_smbus_read_word_swapped(client, OPT3001_LOW_LIMIT);
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
@@ -836,9 +865,11 @@ static int opt3001_probe(struct i2c_client *client)
opt->client = client;
opt->chip_info = i2c_get_match_data(client);
mutex_init(&opt->lock);
ret = devm_mutex_init(dev, &opt->lock);
if (ret)
return ret;
init_waitqueue_head(&opt->result_ready_queue);
i2c_set_clientdata(client, iio);
if (opt->chip_info->has_id) {
ret = opt3001_read_id(opt);
@@ -858,60 +889,18 @@ static int opt3001_probe(struct i2c_client *client)
/* Make use of INT pin only if valid IRQ no. is given */
if (irq > 0) {
ret = request_threaded_irq(irq, NULL, opt3001_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"opt3001", iio);
ret = devm_request_threaded_irq(dev, irq, NULL, opt3001_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"opt3001", iio);
if (ret)
return dev_err_probe(dev, ret,
"failed to request IRQ #%d\n",
irq);
return ret;
opt->use_irq = true;
} else {
dev_dbg(dev, "enabling interrupt-less operation\n");
}
ret = iio_device_register(iio);
if (ret)
goto free_irq;
return 0;
free_irq:
if (irq > 0)
free_irq(irq, iio);
return ret;
}
static void opt3001_remove(struct i2c_client *client)
{
struct iio_dev *iio = i2c_get_clientdata(client);
struct opt3001 *opt = iio_priv(iio);
struct device *dev = &client->dev;
int ret;
u16 reg;
iio_device_unregister(iio);
if (opt->use_irq)
free_irq(client->irq, iio);
ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_CONFIGURATION);
return;
}
reg = ret;
opt3001_set_mode(opt, &reg, OPT3001_CONFIGURATION_M_SHUTDOWN);
ret = i2c_smbus_write_word_swapped(client, OPT3001_CONFIGURATION, reg);
if (ret < 0) {
dev_err(dev, "failed to write register %02x\n",
OPT3001_CONFIGURATION);
}
return devm_iio_device_register(dev, iio);
}
static const struct opt3001_chip_info opt3001_chip_information = {
@@ -952,7 +941,6 @@ MODULE_DEVICE_TABLE(of, opt3001_of_match);
static struct i2c_driver opt3001_driver = {
.probe = opt3001_probe,
.remove = opt3001_remove,
.id_table = opt3001_id,
.driver = {