From: Nuno Sa <nuno.sa@analog.com>
Make use of dev_err_probe() and dev_err_ptr_probe() to simplify error paths
during probe.
Signed-off-by: Nuno Sa <nuno.sa@analog.com>
---
drivers/iio/common/scmi_sensors/scmi_iio.c | 45 +++++++++++++-----------------
1 file changed, 19 insertions(+), 26 deletions(-)
diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
index 0c2caf3570db..841eda79a8cc 100644
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@ -626,12 +626,10 @@ scmi_alloc_iiodev(struct scmi_device *sdev,
SCMI_PROTOCOL_SENSOR, SCMI_EVENT_SENSOR_UPDATE,
&sensor->sensor_info->id,
&sensor->sensor_update_nb);
- if (ret) {
- dev_err(&iiodev->dev,
- "Error in registering sensor update notifier for sensor %s err %d",
- sensor->sensor_info->name, ret);
- return ERR_PTR(ret);
- }
+ if (ret)
+ return dev_err_ptr_probe(&iiodev->dev, ret,
+ "Error in registering sensor update notifier for sensor %s err %d",
+ sensor->sensor_info->name, ret);
scmi_iio_set_timestamp_channel(&iio_channels[i], i);
iiodev->channels = iio_channels;
@@ -653,10 +651,9 @@ static int scmi_iio_dev_probe(struct scmi_device *sdev)
return -ENODEV;
sensor_ops = handle->devm_protocol_get(sdev, SCMI_PROTOCOL_SENSOR, &ph);
- if (IS_ERR(sensor_ops)) {
- dev_err(dev, "SCMI device has no sensor interface\n");
- return PTR_ERR(sensor_ops);
- }
+ if (IS_ERR(sensor_ops))
+ return dev_err_probe(dev, PTR_ERR(sensor_ops),
+ "SCMI device has no sensor interface\n");
nr_sensors = sensor_ops->count_get(ph);
if (!nr_sensors) {
@@ -667,8 +664,8 @@ static int scmi_iio_dev_probe(struct scmi_device *sdev)
for (i = 0; i < nr_sensors; i++) {
sensor_info = sensor_ops->info_get(ph, i);
if (!sensor_info) {
- dev_err(dev, "SCMI sensor %d has missing info\n", i);
- return -EINVAL;
+ return dev_err_probe(dev, -EINVAL,
+ "SCMI sensor %d has missing info\n", i);
}
/* This driver only supports 3-axis accel and gyro, skipping other sensors */
@@ -683,29 +680,25 @@ static int scmi_iio_dev_probe(struct scmi_device *sdev)
scmi_iio_dev = scmi_alloc_iiodev(sdev, sensor_ops, ph,
sensor_info);
if (IS_ERR(scmi_iio_dev)) {
- dev_err(dev,
- "failed to allocate IIO device for sensor %s: %ld\n",
- sensor_info->name, PTR_ERR(scmi_iio_dev));
- return PTR_ERR(scmi_iio_dev);
+ return dev_err_probe(dev, PTR_ERR(scmi_iio_dev),
+ "failed to allocate IIO device for sensor %s: %ld\n",
+ sensor_info->name, PTR_ERR(scmi_iio_dev));
}
err = devm_iio_kfifo_buffer_setup(&scmi_iio_dev->dev,
scmi_iio_dev,
&scmi_iio_buffer_ops);
if (err < 0) {
- dev_err(dev,
- "IIO buffer setup error at sensor %s: %d\n",
- sensor_info->name, err);
- return err;
+ return dev_err_probe(dev, err,
+ "IIO buffer setup error at sensor %s: %d\n",
+ sensor_info->name, err);
}
err = devm_iio_device_register(dev, scmi_iio_dev);
- if (err) {
- dev_err(dev,
- "IIO device registration failed at sensor %s: %d\n",
- sensor_info->name, err);
- return err;
- }
+ if (err)
+ return dev_err_probe(dev, err,
+ "IIO device registration failed at sensor %s: %d\n",
+ sensor_info->name, err);
}
return err;
}
--
2.44.0On Tue, Apr 23, 2024 at 05:20:33PM +0200, Nuno Sa via B4 Relay wrote: > From: Nuno Sa <nuno.sa@analog.com> > > Make use of dev_err_probe() and dev_err_ptr_probe() to simplify error paths > during probe. ... > + return dev_err_ptr_probe(&iiodev->dev, ret, > + "Error in registering sensor update notifier for sensor %s err %d", \n > + sensor->sensor_info->name, ret); ... > + return dev_err_probe(dev, -EINVAL, > + "SCMI sensor %d has missing info\n", i); One line? (It's 99 if you use relaxed limit). ... > + return dev_err_probe(dev, PTR_ERR(scmi_iio_dev), > + "failed to allocate IIO device for sensor %s: %ld\n", > + sensor_info->name, PTR_ERR(scmi_iio_dev)); Please, be sure you remove double error code printing, dev_err_probe() does it for you already. (This applies to all places like this, if any, in the entire series.) ... > + return dev_err_probe(dev, err, > + "IIO buffer setup error at sensor %s: %d\n", > + sensor_info->name, err); Ditto. ... > + return dev_err_probe(dev, err, > + "IIO device registration failed at sensor %s: %d\n", > + sensor_info->name, err); Ditto. -- With Best Regards, Andy Shevchenko
On Tue, 2024-04-23 at 18:50 +0300, Andy Shevchenko wrote: > On Tue, Apr 23, 2024 at 05:20:33PM +0200, Nuno Sa via B4 Relay wrote: > > From: Nuno Sa <nuno.sa@analog.com> > > > > Make use of dev_err_probe() and dev_err_ptr_probe() to simplify error paths > > during probe. > > ... > > > + return dev_err_ptr_probe(&iiodev->dev, ret, > > + "Error in registering sensor update > > notifier for sensor %s err %d", > > \n sure... > > > + sensor->sensor_info->name, ret); > > ... > > > + return dev_err_probe(dev, -EINVAL, > > + "SCMI sensor %d has missing > > info\n", i); > > One line? (It's 99 if you use relaxed limit). Being this IIO, Jonathan prefers to stick the old limit unless readability is hurt... > > ... > > > + return dev_err_probe(dev, PTR_ERR(scmi_iio_dev), > > + "failed to allocate IIO device for > > sensor %s: %ld\n", > > + sensor_info->name, > > PTR_ERR(scmi_iio_dev)); > > Please, be sure you remove double error code printing, dev_err_probe() does it > for you already. (This applies to all places like this, if any, in the entire > series.) Up... blind conversion. Thanks! - Nuno Sá
© 2016 - 2026 Red Hat, Inc.