usb: musb: mediatek: Simplify code with dev_err_probe()

The combination of dev_err() and the returned error code could be
replaced by dev_err_probe() in driver's probe function. Let's,
converting to dev_err_probe() to make code more simple.

Signed-off-by: Lin Ruifeng <linruifeng4@huawei.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Link: https://lore.kernel.org/r/20240907081351.19879-1-linruifeng4@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
index 0a35aab3ab815f06db02ac06c6d9493daf2852b6..63c86c046b9865b1157a838b318ea7155f1c5bc5 100644 (file)
--- a/drivers/usb/musb/mediatek.c
+++ b/drivers/usb/musb/mediatek.c
@@ -416,10 +416,9 @@ static int mtk_musb_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        ret = of_platform_populate(np, NULL, NULL, dev);
-       if (ret) {
-               dev_err(dev, "failed to create child devices at %p\n", np);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret,
+                               "failed to create child devices at %p\n", np);
 
        ret = mtk_musb_clks_get(glue);
        if (ret)
@@ -448,23 +447,19 @@ static int mtk_musb_probe(struct platform_device *pdev)
                glue->role = USB_ROLE_NONE;
                break;
        default:
-               dev_err(&pdev->dev, "Error 'dr_mode' property\n");
-               return -EINVAL;
+               return dev_err_probe(&pdev->dev, -EINVAL,
+                               "Error 'dr_mode' property\n");
        }
 
        glue->phy = devm_of_phy_get_by_index(dev, np, 0);
-       if (IS_ERR(glue->phy)) {
-               dev_err(dev, "fail to getting phy %ld\n",
-                       PTR_ERR(glue->phy));
-               return PTR_ERR(glue->phy);
-       }
+       if (IS_ERR(glue->phy))
+               return dev_err_probe(dev, PTR_ERR(glue->phy),
+                               "fail to getting phy\n");
 
        glue->usb_phy = usb_phy_generic_register();
-       if (IS_ERR(glue->usb_phy)) {
-               dev_err(dev, "fail to registering usb-phy %ld\n",
-                       PTR_ERR(glue->usb_phy));
-               return PTR_ERR(glue->usb_phy);
-       }
+       if (IS_ERR(glue->usb_phy))
+               return dev_err_probe(dev, PTR_ERR(glue->usb_phy),
+                               "fail to registering usb-phy\n");
 
        glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
        if (IS_ERR(glue->xceiv)) {