Message ID | 1597127072-26365-3-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [V2,1/3] pwm: imx-tpm: Use dev_err_probe() to simplify error handling | expand |
On Tue, 11 Aug 2020, Anson Huang wrote: > dev_err_probe() can reduce code size, uniform error handling and record the > defer probe reason etc., use it to simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > changes since V1: > - remove redundant return value print. > --- > drivers/pwm/pwm-imx1.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) Acked-by: Lee Jones <lee.jones@linaro.org>
On Tue, Aug 11, 2020 at 02:24:32PM +0800, Anson Huang wrote: > dev_err_probe() can reduce code size, uniform error handling and record the > defer probe reason etc., use it to simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > changes since V1: > - remove redundant return value print. > --- > drivers/pwm/pwm-imx1.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/pwm/pwm-imx1.c b/drivers/pwm/pwm-imx1.c > index f8b2c2e..4877734 100644 > --- a/drivers/pwm/pwm-imx1.c > +++ b/drivers/pwm/pwm-imx1.c > @@ -145,23 +145,14 @@ static int pwm_imx1_probe(struct platform_device *pdev) > platform_set_drvdata(pdev, imx); > > imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); > - if (IS_ERR(imx->clk_ipg)) { > - dev_err(&pdev->dev, "getting ipg clock failed with %ld\n", > - PTR_ERR(imx->clk_ipg)); > - return PTR_ERR(imx->clk_ipg); > - } > + if (IS_ERR(imx->clk_ipg)) > + return dev_err_probe(&pdev->dev, PTR_ERR(imx->clk_ipg), > + "getting ipg clock failed\n"); > > imx->clk_per = devm_clk_get(&pdev->dev, "per"); > - if (IS_ERR(imx->clk_per)) { > - int ret = PTR_ERR(imx->clk_per); > - > - if (ret != -EPROBE_DEFER) > - dev_err(&pdev->dev, > - "failed to get peripheral clock: %d\n", > - ret); > - > - return ret; > - } > + if (IS_ERR(imx->clk_per)) > + return dev_err_probe(&pdev->dev, PTR_ERR(imx->clk_per), > + "failed to get peripheral clock\n"); Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
diff --git a/drivers/pwm/pwm-imx1.c b/drivers/pwm/pwm-imx1.c index f8b2c2e..4877734 100644 --- a/drivers/pwm/pwm-imx1.c +++ b/drivers/pwm/pwm-imx1.c @@ -145,23 +145,14 @@ static int pwm_imx1_probe(struct platform_device *pdev) platform_set_drvdata(pdev, imx); imx->clk_ipg = devm_clk_get(&pdev->dev, "ipg"); - if (IS_ERR(imx->clk_ipg)) { - dev_err(&pdev->dev, "getting ipg clock failed with %ld\n", - PTR_ERR(imx->clk_ipg)); - return PTR_ERR(imx->clk_ipg); - } + if (IS_ERR(imx->clk_ipg)) + return dev_err_probe(&pdev->dev, PTR_ERR(imx->clk_ipg), + "getting ipg clock failed\n"); imx->clk_per = devm_clk_get(&pdev->dev, "per"); - if (IS_ERR(imx->clk_per)) { - int ret = PTR_ERR(imx->clk_per); - - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "failed to get peripheral clock: %d\n", - ret); - - return ret; - } + if (IS_ERR(imx->clk_per)) + return dev_err_probe(&pdev->dev, PTR_ERR(imx->clk_per), + "failed to get peripheral clock\n"); imx->chip.ops = &pwm_imx1_ops; imx->chip.dev = &pdev->dev;
dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- changes since V1: - remove redundant return value print. --- drivers/pwm/pwm-imx1.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)