power: supply: lego_ev3: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 26 Aug 2020 14:48:58 +0000 (16:48 +0200)
committerSebastian Reichel <sre@kernel.org>
Wed, 26 Aug 2020 15:25:45 +0000 (17:25 +0200)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/lego_ev3_battery.c

index 1ae3710..ccb00be 100644 (file)
@@ -166,27 +166,21 @@ static int lego_ev3_battery_probe(struct platform_device *pdev)
 
        batt->iio_v = devm_iio_channel_get(dev, "voltage");
        err = PTR_ERR_OR_ZERO(batt->iio_v);
-       if (err) {
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get voltage iio channel\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "Failed to get voltage iio channel\n");
 
        batt->iio_i = devm_iio_channel_get(dev, "current");
        err = PTR_ERR_OR_ZERO(batt->iio_i);
-       if (err) {
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get current iio channel\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "Failed to get current iio channel\n");
 
        batt->rechargeable_gpio = devm_gpiod_get(dev, "rechargeable", GPIOD_IN);
        err = PTR_ERR_OR_ZERO(batt->rechargeable_gpio);
-       if (err) {
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get rechargeable gpio\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "Failed to get rechargeable gpio\n");
 
        /*
         * The rechargeable battery indication switch cannot be changed without