USB: PHY: JZ4770: Switch to use dev_err_probe() helper
authorYang Yingliang <yangyingliang@huawei.com>
Thu, 22 Sep 2022 13:33:23 +0000 (21:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Sep 2022 08:37:00 +0000 (10:37 +0200)
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs. It's more simple in error path.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220922133323.2135494-2-yangyingliang@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/phy/phy-jz4770.c

index 4025da2..f16adca 100644 (file)
@@ -321,27 +321,18 @@ static int jz4770_phy_probe(struct platform_device *pdev)
        }
 
        priv->clk = devm_clk_get(dev, NULL);
-       if (IS_ERR(priv->clk)) {
-               err = PTR_ERR(priv->clk);
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get clock\n");
-               return err;
-       }
+       if (IS_ERR(priv->clk))
+               return dev_err_probe(dev, PTR_ERR(priv->clk),
+                                    "Failed to get clock\n");
 
        priv->vcc_supply = devm_regulator_get(dev, "vcc");
-       if (IS_ERR(priv->vcc_supply)) {
-               err = PTR_ERR(priv->vcc_supply);
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Failed to get regulator\n");
-               return err;
-       }
+       if (IS_ERR(priv->vcc_supply))
+               return dev_err_probe(dev, PTR_ERR(priv->vcc_supply),
+                                    "Failed to get regulator\n");
 
        err = usb_add_phy(&priv->phy, USB_PHY_TYPE_USB2);
-       if (err) {
-               if (err != -EPROBE_DEFER)
-                       dev_err(dev, "Unable to register PHY\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "Unable to register PHY\n");
 
        return devm_add_action_or_reset(dev, ingenic_usb_phy_remove, &priv->phy);
 }