iio: common: scmi_iio: convert to dev_err_probe()

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>
Link: https://patch.msgid.link/20240606-dev-add_dev_errp_probe-v3-4-51bb229edd79@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
index 0c2caf3570db9729fadfbeb509e0218b7fd45d8d..7190eaede7fbe891d67ff0469874bb9f650dd9bd 100644 (file)
--- 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\n",
+                                        sensor->sensor_info->name);
 
        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\n",
+                                            sensor_info->name);
                }
 
                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\n",
+                                            sensor_info->name);
                }
 
                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\n",
+                                            sensor_info->name);
        }
        return err;
 }