Skip to content

Commit 7b24a3b

Browse files
LinRuifeng700gregkh
authored andcommitted
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 <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Reviewed-by: Matthias Brugger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b8a93e8 commit 7b24a3b

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

drivers/usb/musb/mediatek.c

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,9 @@ static int mtk_musb_probe(struct platform_device *pdev)
416416
return -ENOMEM;
417417

418418
ret = of_platform_populate(np, NULL, NULL, dev);
419-
if (ret) {
420-
dev_err(dev, "failed to create child devices at %p\n", np);
421-
return ret;
422-
}
419+
if (ret)
420+
return dev_err_probe(dev, ret,
421+
"failed to create child devices at %p\n", np);
423422

424423
ret = mtk_musb_clks_get(glue);
425424
if (ret)
@@ -448,23 +447,19 @@ static int mtk_musb_probe(struct platform_device *pdev)
448447
glue->role = USB_ROLE_NONE;
449448
break;
450449
default:
451-
dev_err(&pdev->dev, "Error 'dr_mode' property\n");
452-
return -EINVAL;
450+
return dev_err_probe(&pdev->dev, -EINVAL,
451+
"Error 'dr_mode' property\n");
453452
}
454453

455454
glue->phy = devm_of_phy_get_by_index(dev, np, 0);
456-
if (IS_ERR(glue->phy)) {
457-
dev_err(dev, "fail to getting phy %ld\n",
458-
PTR_ERR(glue->phy));
459-
return PTR_ERR(glue->phy);
460-
}
455+
if (IS_ERR(glue->phy))
456+
return dev_err_probe(dev, PTR_ERR(glue->phy),
457+
"fail to getting phy\n");
461458

462459
glue->usb_phy = usb_phy_generic_register();
463-
if (IS_ERR(glue->usb_phy)) {
464-
dev_err(dev, "fail to registering usb-phy %ld\n",
465-
PTR_ERR(glue->usb_phy));
466-
return PTR_ERR(glue->usb_phy);
467-
}
460+
if (IS_ERR(glue->usb_phy))
461+
return dev_err_probe(dev, PTR_ERR(glue->usb_phy),
462+
"fail to registering usb-phy\n");
468463

469464
glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
470465
if (IS_ERR(glue->xceiv)) {

0 commit comments

Comments
 (0)