| Message ID | 20240902053001.930379-1-yanzhen@vivo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] soc: mediatek: mtk-mmsys: Simplify with dev_err_probe() | expand |
On 02/09/2024 07:30, Yan Zhen wrote: > Use dev_err_probe() to simplify the error path and unify a > message template. > > Using this helper is totally fine even if err is known to never > be -EPROBE_DEFER. > > The benefit compared to a normal dev_err() is the standardized format > of the error code, it being emitted symbolically and the fact that > the error code is returned which allows more compact error paths. > > Signed-off-by: Yan Zhen <yanzhen@vivo.com> > --- > > Changes in v3: > - Modify the message. > - Add the '\n' at the end of the string. > > drivers/soc/mediatek/mtk-mmsys.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c > index 938240714e54..170319163c28 100644 > --- a/drivers/soc/mediatek/mtk-mmsys.c > +++ b/drivers/soc/mediatek/mtk-mmsys.c > @@ -397,11 +397,9 @@ static int mtk_mmsys_probe(struct platform_device *pdev) > return -ENOMEM; > > mmsys->regs = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(mmsys->regs)) { > - ret = PTR_ERR(mmsys->regs); > - dev_err(dev, "Failed to ioremap mmsys registers: %d\n", ret); > - return ret; > - } > + if (IS_ERR(mmsys->regs)) > + return dev_err_probe(dev, PTR_ERR(mmsys->regs), > + "Failed to ioremap mmsys registers\n"); > > mmsys->data = of_device_get_match_data(&pdev->dev); > > @@ -413,10 +411,9 @@ static int mtk_mmsys_probe(struct platform_device *pdev) > mmsys->rcdev.ops = &mtk_mmsys_reset_ops; > mmsys->rcdev.of_node = pdev->dev.of_node; > ret = devm_reset_controller_register(&pdev->dev, &mmsys->rcdev); > - if (ret) { > - dev_err(&pdev->dev, "Couldn't register mmsys reset controller: %d\n", ret); > - return ret; > - } > + if (ret) > + dev_err_probe(&pdev->dev, ret, > + "Couldn't register mmsys reset controller\n"); Your missing return of the error value. > } > > /* CMDQ is optional */
diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 938240714e54..170319163c28 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -397,11 +397,9 @@ static int mtk_mmsys_probe(struct platform_device *pdev) return -ENOMEM; mmsys->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(mmsys->regs)) { - ret = PTR_ERR(mmsys->regs); - dev_err(dev, "Failed to ioremap mmsys registers: %d\n", ret); - return ret; - } + if (IS_ERR(mmsys->regs)) + return dev_err_probe(dev, PTR_ERR(mmsys->regs), + "Failed to ioremap mmsys registers\n"); mmsys->data = of_device_get_match_data(&pdev->dev); @@ -413,10 +411,9 @@ static int mtk_mmsys_probe(struct platform_device *pdev) mmsys->rcdev.ops = &mtk_mmsys_reset_ops; mmsys->rcdev.of_node = pdev->dev.of_node; ret = devm_reset_controller_register(&pdev->dev, &mmsys->rcdev); - if (ret) { - dev_err(&pdev->dev, "Couldn't register mmsys reset controller: %d\n", ret); - return ret; - } + if (ret) + dev_err_probe(&pdev->dev, ret, + "Couldn't register mmsys reset controller\n"); } /* CMDQ is optional */
Use dev_err_probe() to simplify the error path and unify a message template. Using this helper is totally fine even if err is known to never be -EPROBE_DEFER. The benefit compared to a normal dev_err() is the standardized format of the error code, it being emitted symbolically and the fact that the error code is returned which allows more compact error paths. Signed-off-by: Yan Zhen <yanzhen@vivo.com> --- Changes in v3: - Modify the message. - Add the '\n' at the end of the string. drivers/soc/mediatek/mtk-mmsys.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)