w1: gpio: Switch to use dev_err_probe()

Switch to use dev_err_probe() to simplify the error path and
unify a message template.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20240307143644.3787260-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 8ea53c757c990a02f5c983f6d2933377e37fd11e..a5ac34b32f544926dfeedbffcacca8b7061998e9 100644 (file)
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -91,18 +91,14 @@ static int w1_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        ddata->gpiod = devm_gpiod_get_index(dev, NULL, 0, gflags);
-       if (IS_ERR(ddata->gpiod)) {
-               dev_err(dev, "gpio_request (pin) failed\n");
-               return PTR_ERR(ddata->gpiod);
-       }
+       if (IS_ERR(ddata->gpiod))
+               return dev_err_probe(dev, PTR_ERR(ddata->gpiod), "gpio_request (pin) failed\n");
 
        ddata->pullup_gpiod =
                devm_gpiod_get_index_optional(dev, NULL, 1, GPIOD_OUT_LOW);
-       if (IS_ERR(ddata->pullup_gpiod)) {
-               dev_err(dev, "gpio_request_one "
-                       "(ext_pullup_enable_pin) failed\n");
-               return PTR_ERR(ddata->pullup_gpiod);
-       }
+       if (IS_ERR(ddata->pullup_gpiod))
+               return dev_err_probe(dev, PTR_ERR(ddata->pullup_gpiod),
+                                    "gpio_request (ext_pullup_enable_pin) failed\n");
 
        master->data = ddata;
        master->read_bit = w1_gpio_read_bit;
@@ -119,10 +115,8 @@ static int w1_gpio_probe(struct platform_device *pdev)
                master->set_pullup = w1_gpio_set_pullup;
 
        err = w1_add_master_device(master);
-       if (err) {
-               dev_err(dev, "w1_add_master device failed\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "w1_add_master device failed\n");
 
        if (ddata->pullup_gpiod)
                gpiod_set_value(ddata->pullup_gpiod, 1);