]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
leds: sgm3140: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Wed, 26 Aug 2020 14:50:12 +0000 (16:50 +0200)
committerPavel Machek <pavel@ucw.cz>
Wed, 9 Sep 2020 09:20:09 +0000 (11:20 +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>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
drivers/leds/leds-sgm3140.c

index 28c8b31fa952adc2d77852d5cdcd304b92f02fd3..f4f831570f11c442b8b4c9887fc482c6c15678f2 100644 (file)
@@ -195,30 +195,21 @@ static int sgm3140_probe(struct platform_device *pdev)
 
        priv->flash_gpio = devm_gpiod_get(&pdev->dev, "flash", GPIOD_OUT_LOW);
        ret = PTR_ERR_OR_ZERO(priv->flash_gpio);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev,
-                               "Failed to request flash gpio: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "Failed to request flash gpio\n");
 
        priv->enable_gpio = devm_gpiod_get(&pdev->dev, "enable", GPIOD_OUT_LOW);
        ret = PTR_ERR_OR_ZERO(priv->enable_gpio);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev,
-                               "Failed to request enable gpio: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "Failed to request enable gpio\n");
 
        priv->vin_regulator = devm_regulator_get(&pdev->dev, "vin");
        ret = PTR_ERR_OR_ZERO(priv->vin_regulator);
-       if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev,
-                               "Failed to request regulator: %d\n", ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret,
+                                    "Failed to request regulator\n");
 
        child_node = fwnode_get_next_available_child_node(pdev->dev.fwnode,
                                                          NULL);