| Message ID | 20210427164522.2886825-1-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | clk: qcom: Simplify usage of dev_err_probe() | expand |
On Tue 27 Apr 11:45 CDT 2021, Uwe Kleine-K?nig wrote: > dev_err_probe() returns the error code passed as second parameter. Also if > the error code is -EPROBE_DEFER dev_err_probe() is silent, so there is no > need to check for this value before calling dev_err_probe(). > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> > --- > drivers/clk/qcom/apcs-sdx55.c | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > > diff --git a/drivers/clk/qcom/apcs-sdx55.c b/drivers/clk/qcom/apcs-sdx55.c > index d0edabebf9c2..6810637f32e3 100644 > --- a/drivers/clk/qcom/apcs-sdx55.c > +++ b/drivers/clk/qcom/apcs-sdx55.c > @@ -56,10 +56,8 @@ static int qcom_apcs_sdx55_clk_probe(struct platform_device *pdev) > int ret; > > regmap = dev_get_regmap(parent, NULL); > - if (!regmap) { > - dev_err_probe(dev, -ENODEV, "Failed to get parent regmap\n"); > - return -ENODEV; > - } > + if (!regmap) > + return dev_err_probe(dev, -ENODEV, "Failed to get parent regmap\n"); > > a7cc = devm_kzalloc(dev, sizeof(*a7cc), GFP_KERNEL); > if (!a7cc) > @@ -80,19 +78,15 @@ static int qcom_apcs_sdx55_clk_probe(struct platform_device *pdev) > a7cc->parent_map = apcs_mux_clk_parent_map; > > a7cc->pclk = devm_clk_get(parent, "pll"); > - if (IS_ERR(a7cc->pclk)) { > - ret = PTR_ERR(a7cc->pclk); > - if (ret != -EPROBE_DEFER) > - dev_err_probe(dev, ret, "Failed to get PLL clk\n"); > - return ret; > - } > + if (IS_ERR(a7cc->pclk)) > + return dev_err_probe(dev, PTR_ERR(a7cc->pclk), > + "Failed to get PLL clk\n"); > > a7cc->clk_nb.notifier_call = a7cc_notifier_cb; > ret = clk_notifier_register(a7cc->pclk, &a7cc->clk_nb); > - if (ret) { > - dev_err_probe(dev, ret, "Failed to register clock notifier\n"); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, > + "Failed to register clock notifier\n"); > > ret = devm_clk_register_regmap(dev, &a7cc->clkr); > if (ret) { > -- > 2.30.2 >
Hello, On 4/27/21 6:56 PM, Bjorn Andersson wrote: > On Tue 27 Apr 11:45 CDT 2021, Uwe Kleine-K?nig wrote: @Bjorn Andersson: Your MUA is broken, it misquotes the ö in my name (in the mail and the To header). >> dev_err_probe() returns the error code passed as second parameter. Also if >> the error code is -EPROBE_DEFER dev_err_probe() is silent, so there is no >> need to check for this value before calling dev_err_probe(). >> > > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> thanks. This patch is nearly a month old now. Is drivers/clk still maintained? Best regards Uwe
(My MUA probably messed this up) Quoting Uwe Kleine-König (2021-04-27 09:45:22) > dev_err_probe() returns the error code passed as second parameter. Also if > the error code is -EPROBE_DEFER dev_err_probe() is silent, so there is no > need to check for this value before calling dev_err_probe(). > > Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> > --- Applied to clk-next
diff --git a/drivers/clk/qcom/apcs-sdx55.c b/drivers/clk/qcom/apcs-sdx55.c index d0edabebf9c2..6810637f32e3 100644 --- a/drivers/clk/qcom/apcs-sdx55.c +++ b/drivers/clk/qcom/apcs-sdx55.c @@ -56,10 +56,8 @@ static int qcom_apcs_sdx55_clk_probe(struct platform_device *pdev) int ret; regmap = dev_get_regmap(parent, NULL); - if (!regmap) { - dev_err_probe(dev, -ENODEV, "Failed to get parent regmap\n"); - return -ENODEV; - } + if (!regmap) + return dev_err_probe(dev, -ENODEV, "Failed to get parent regmap\n"); a7cc = devm_kzalloc(dev, sizeof(*a7cc), GFP_KERNEL); if (!a7cc) @@ -80,19 +78,15 @@ static int qcom_apcs_sdx55_clk_probe(struct platform_device *pdev) a7cc->parent_map = apcs_mux_clk_parent_map; a7cc->pclk = devm_clk_get(parent, "pll"); - if (IS_ERR(a7cc->pclk)) { - ret = PTR_ERR(a7cc->pclk); - if (ret != -EPROBE_DEFER) - dev_err_probe(dev, ret, "Failed to get PLL clk\n"); - return ret; - } + if (IS_ERR(a7cc->pclk)) + return dev_err_probe(dev, PTR_ERR(a7cc->pclk), + "Failed to get PLL clk\n"); a7cc->clk_nb.notifier_call = a7cc_notifier_cb; ret = clk_notifier_register(a7cc->pclk, &a7cc->clk_nb); - if (ret) { - dev_err_probe(dev, ret, "Failed to register clock notifier\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to register clock notifier\n"); ret = devm_clk_register_regmap(dev, &a7cc->clkr); if (ret) {
dev_err_probe() returns the error code passed as second parameter. Also if the error code is -EPROBE_DEFER dev_err_probe() is silent, so there is no need to check for this value before calling dev_err_probe(). Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> --- drivers/clk/qcom/apcs-sdx55.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)