| Message ID | 20240907034226.120159-1-linruifeng4@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [-next] usb: musb: mediatek: Simplify code with dev_err_probe() | expand |
Le 07/09/2024 à 05:42, Lin Ruifeng a écrit : > 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-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> > --- > drivers/usb/musb/mediatek.c | 27 +++++++++++---------------- > 1 file changed, 11 insertions(+), 16 deletions(-) > > diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c > index 0a35aab3ab81..393b909de238 100644 > --- 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, > + "failed to create child devices at %p\n", np); This message is wrong. You made a cut'n'paste of the previous one. > } > > 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"); While a it, change it to "failed to get phy"? > > 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"); While a it, change it to "failed to register usb-phy"? CJ > > glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > if (IS_ERR(glue->xceiv)) {
diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c index 0a35aab3ab81..393b909de238 100644 --- 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, + "failed to create child devices at %p\n", np); } 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)) {
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> --- drivers/usb/musb/mediatek.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)