usb: common: usb-conn-gpio: use dev_err_probe() to print log

Use dev_err_probe() to print debug or error message depending on
whether the error value is -DPROBE_DEFER or not.

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1621406386-18838-2-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
index c9545a4..dfbbc4f 100644 (file)
--- a/drivers/usb/common/usb-conn-gpio.c
+++ b/drivers/usb/common/usb-conn-gpio.c
@@ -223,18 +223,14 @@ static int usb_conn_probe(struct platform_device *pdev)
        }
 
        if (IS_ERR(info->vbus)) {
-               if (PTR_ERR(info->vbus) != -EPROBE_DEFER)
-                       dev_err(dev, "failed to get vbus: %ld\n", PTR_ERR(info->vbus));
-               return PTR_ERR(info->vbus);
+               ret = PTR_ERR(info->vbus);
+               return dev_err_probe(dev, ret, "failed to get vbus :%d\n", ret);
        }
 
        info->role_sw = usb_role_switch_get(dev);
-       if (IS_ERR(info->role_sw)) {
-               if (PTR_ERR(info->role_sw) != -EPROBE_DEFER)
-                       dev_err(dev, "failed to get role switch\n");
-
-               return PTR_ERR(info->role_sw);
-       }
+       if (IS_ERR(info->role_sw))
+               return dev_err_probe(dev, PTR_ERR(info->role_sw),
+                                    "failed to get role switch\n");
 
        ret = usb_conn_psy_register(info);
        if (ret)