iio: adc: hx711: use dev_err_probe()

Use dev_err_probe() to simplify error returns in the probe function.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Andreas Klinger <ak@it-klinger.de>
Link: https://patch.msgid.link/20240621-iio-regulator-refactor-round-2-v1-4-49e50cd0b99a@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c
index 8461b1fe6bad1c4c3bbb3d8756eec5e90e1a80c1..b3372ccff7d5e865a50cc52529d01d7a2388ac26 100644 (file)
--- a/drivers/iio/adc/hx711.c
+++ b/drivers/iio/adc/hx711.c
@@ -464,10 +464,8 @@ static int hx711_probe(struct platform_device *pdev)
        int i;
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(struct hx711_data));
-       if (!indio_dev) {
-               dev_err(dev, "failed to allocate IIO device\n");
-               return -ENOMEM;
-       }
+       if (!indio_dev)
+               return dev_err_probe(dev, -ENOMEM, "failed to allocate IIO device\n");
 
        hx711_data = iio_priv(indio_dev);
        hx711_data->dev = dev;
@@ -479,22 +477,18 @@ static int hx711_probe(struct platform_device *pdev)
         * in the driver it is an output
         */
        hx711_data->gpiod_pd_sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
-       if (IS_ERR(hx711_data->gpiod_pd_sck)) {
-               dev_err(dev, "failed to get sck-gpiod: err=%ld\n",
-                                       PTR_ERR(hx711_data->gpiod_pd_sck));
-               return PTR_ERR(hx711_data->gpiod_pd_sck);
-       }
+       if (IS_ERR(hx711_data->gpiod_pd_sck))
+               return dev_err_probe(dev, PTR_ERR(hx711_data->gpiod_pd_sck),
+                                    "failed to get sck-gpiod\n");
 
        /*
         * DOUT stands for serial data output of HX711
         * for the driver it is an input
         */
        hx711_data->gpiod_dout = devm_gpiod_get(dev, "dout", GPIOD_IN);
-       if (IS_ERR(hx711_data->gpiod_dout)) {
-               dev_err(dev, "failed to get dout-gpiod: err=%ld\n",
-                                       PTR_ERR(hx711_data->gpiod_dout));
-               return PTR_ERR(hx711_data->gpiod_dout);
-       }
+       if (IS_ERR(hx711_data->gpiod_dout))
+               return dev_err_probe(dev, PTR_ERR(hx711_data->gpiod_dout),
+                                    "failed to get dout-gpiod\n");
 
        ret = devm_regulator_get_enable_read_voltage(dev, "avdd");
        if (ret < 0)
@@ -548,16 +542,13 @@ static int hx711_probe(struct platform_device *pdev)
        ret = devm_iio_triggered_buffer_setup(dev, indio_dev,
                                              iio_pollfunc_store_time,
                                              hx711_trigger, NULL);
-       if (ret < 0) {
-               dev_err(dev, "setup of iio triggered buffer failed\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret,
+                                    "setup of iio triggered buffer failed\n");
 
        ret = devm_iio_device_register(dev, indio_dev);
-       if (ret < 0) {
-               dev_err(dev, "Couldn't register the device\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Couldn't register the device\n");
 
        return 0;
 }