github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-25 17:42:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

iio: light: opt3001: prefer dev_err_probe()

Browse Source 
Switch driver to use dev_err_probe() to unify error messages generated
in *_probe() and probe path functions.

Reviewed-by: Maxwell Doose <m32285159@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
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:05 +02:00 committed by Jonathan Cameron
parent c9439c1de8
commit 8289400299
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,21 +700,17 @@ static int opt3001_read_id(struct opt3001 *opt)
int ret;
ret = i2c_smbus_read_word_swapped(client, OPT3001_MANUFACTURER_ID);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_MANUFACTURER_ID);
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
OPT3001_MANUFACTURER_ID);
manufacturer[0] = ret >> 8;
manufacturer[1] = ret & 0xff;
ret = i2c_smbus_read_word_swapped(client, OPT3001_DEVICE_ID);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_DEVICE_ID);
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
OPT3001_DEVICE_ID);
device_id = ret;
@ -732,11 +728,9 @@ static int opt3001_configure(struct opt3001 *opt)
u16 reg;
ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_CONFIGURATION);
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
OPT3001_CONFIGURATION);
reg = ret;
@ -760,28 +754,22 @@ static int opt3001_configure(struct opt3001 *opt)
reg &= ~OPT3001_CONFIGURATION_FC_MASK;
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 ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to write register %02x\n",
OPT3001_CONFIGURATION);
ret = i2c_smbus_read_word_swapped(client, OPT3001_LOW_LIMIT);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_LOW_LIMIT);
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
OPT3001_LOW_LIMIT);
opt->low_thresh_mantissa = OPT3001_REG_MANTISSA(ret);
opt->low_thresh_exp = OPT3001_REG_EXPONENT(ret);
ret = i2c_smbus_read_word_swapped(client, OPT3001_HIGH_LIMIT);
if (ret < 0) {
dev_err(dev, "failed to read register %02x\n",
OPT3001_HIGH_LIMIT);
return ret;
}
if (ret < 0)
return dev_err_probe(dev, ret, "failed to read register %02x\n",
OPT3001_HIGH_LIMIT);
opt->high_thresh_mantissa = OPT3001_REG_MANTISSA(ret);
opt->high_thresh_exp = OPT3001_REG_EXPONENT(ret);
@ -888,10 +876,11 @@ static int opt3001_probe(struct i2c_client *client)
ret = request_threaded_irq(irq, NULL, opt3001_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"opt3001", iio);
if (ret) {
dev_err(dev, "failed to request IRQ #%d\n", irq);
return ret;
}
if (ret)
return dev_err_probe(dev, ret,
"failed to request IRQ #%d\n",
irq);
opt->use_irq = true;
} else {
dev_dbg(dev, "enabling interrupt-less operation\n");