extcon: palmas: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Fri, 28 Aug 2020 15:13:37 +0000 (17:13 +0200)
committerChanwoo Choi <cw00.choi@samsung.com>
Thu, 24 Sep 2020 10:20:49 +0000 (19:20 +0900)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-palmas.c

index e8e9eeb..a2852bc 100644 (file)
@@ -205,21 +205,15 @@ static int palmas_usb_probe(struct platform_device *pdev)
 
        palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id",
                                                        GPIOD_IN);
-       if (PTR_ERR(palmas_usb->id_gpiod) == -EPROBE_DEFER) {
-               return -EPROBE_DEFER;
-       } else if (IS_ERR(palmas_usb->id_gpiod)) {
-               dev_err(&pdev->dev, "failed to get id gpio\n");
-               return PTR_ERR(palmas_usb->id_gpiod);
-       }
+       if (IS_ERR(palmas_usb->id_gpiod))
+               return dev_err_probe(&pdev->dev, PTR_ERR(palmas_usb->id_gpiod),
+                                    "failed to get id gpio\n");
 
        palmas_usb->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus",
                                                        GPIOD_IN);
-       if (PTR_ERR(palmas_usb->vbus_gpiod) == -EPROBE_DEFER) {
-               return -EPROBE_DEFER;
-       } else if (IS_ERR(palmas_usb->vbus_gpiod)) {
-               dev_err(&pdev->dev, "failed to get vbus gpio\n");
-               return PTR_ERR(palmas_usb->vbus_gpiod);
-       }
+       if (IS_ERR(palmas_usb->vbus_gpiod))
+               return dev_err_probe(&pdev->dev, PTR_ERR(palmas_usb->vbus_gpiod),
+                                    "failed to get id gpio\n");
 
        if (palmas_usb->enable_id_detection && palmas_usb->id_gpiod) {
                palmas_usb->enable_id_detection = false;