| Message ID | 20250319-al3010-iio-regmap-v2-11-1310729d0543@ixit.cz (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | iio: light: Modernize al3010 and al3320a codebase | expand |
On Wed, 19 Mar 2025 21:59:50 +0100 David Heidelberg via B4 Relay <devnull+david.ixit.cz@kernel.org> wrote: > From: David Heidelberg <david@ixit.cz> > > Slight simplification of the code. > > Signed-off-by: David Heidelberg <david@ixit.cz> > --- > drivers/iio/light/al3320a.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c > index 1b2b0359ed5dad5e00d2fe584f8f3495c13c997e..1943e6f34a70b00b5d732dbf4ae6ccb4376303b7 100644 > --- a/drivers/iio/light/al3320a.c > +++ b/drivers/iio/light/al3320a.c > @@ -206,14 +206,12 @@ static int al3320a_probe(struct i2c_client *client) > indio_dev->modes = INDIO_DIRECT_MODE; > > ret = al3320a_init(data); > - if (ret < 0) { > - dev_err(dev, "al3320a chip init failed\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to init ALS\n"); > > ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data); Seeing this here made me look. Seems that the error path I highlighted in patch 9 is here as well. I'd push this devm registration down into init where it can immediately follow the power up. > - if (ret < 0) > - return ret; > + if (ret) > + return dev_err_probe(dev, ret, "failed to add action\n"); > > return devm_iio_device_register(dev, indio_dev); > } >
diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c index 1b2b0359ed5dad5e00d2fe584f8f3495c13c997e..1943e6f34a70b00b5d732dbf4ae6ccb4376303b7 100644 --- a/drivers/iio/light/al3320a.c +++ b/drivers/iio/light/al3320a.c @@ -206,14 +206,12 @@ static int al3320a_probe(struct i2c_client *client) indio_dev->modes = INDIO_DIRECT_MODE; ret = al3320a_init(data); - if (ret < 0) { - dev_err(dev, "al3320a chip init failed\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to init ALS\n"); ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data); - if (ret < 0) - return ret; + if (ret) + return dev_err_probe(dev, ret, "failed to add action\n"); return devm_iio_device_register(dev, indio_dev); }