extcon: palmas: Hide error messages if gpio returns -EPROBE_DEFER
authorH. Nikolaus Schaller <hns@goldelico.com>
Mon, 17 Feb 2020 13:38:15 +0000 (14:38 +0100)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 24 Mar 2020 23:16:13 +0000 (08:16 +0900)
If the gpios are probed after this driver (e.g. if they
come from an i2c expander) there is no need to print an
error message.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-palmas.c

index edc5016f46f17815ddd5eae9925db32ec194ca9f..cea58d0cb45741bd056e36fc079199df9cc4e645 100644 (file)
@@ -205,14 +205,18 @@ static int palmas_usb_probe(struct platform_device *pdev)
 
        palmas_usb->id_gpiod = devm_gpiod_get_optional(&pdev->dev, "id",
                                                        GPIOD_IN);
-       if (IS_ERR(palmas_usb->id_gpiod)) {
+       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);
        }
 
        palmas_usb->vbus_gpiod = devm_gpiod_get_optional(&pdev->dev, "vbus",
                                                        GPIOD_IN);
-       if (IS_ERR(palmas_usb->vbus_gpiod)) {
+       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);
        }