2019-12-30 08:59:31

by Yue Haibing

Subject: [PATCH -next] PM / devfreq: imx8m-ddrc: Fix inconsistent IS_ERR and PTR_ERR

Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe().
Detected using Coccinelle.

Signed-off-by: YueHaibing <[email protected]>
---
drivers/devfreq/imx8m-ddrc.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/drivers/devfreq/imx8m-ddrc.c b/drivers/devfreq/imx8m-ddrc.c
index 53df792..bc82d36 100644
--- a/drivers/devfreq/imx8m-ddrc.c
+++ b/drivers/devfreq/imx8m-ddrc.c
@@ -395,15 +395,27 @@ static int imx8m_ddrc_probe(struct platform_device *pdev)
}

priv->dram_core = devm_clk_get(dev, "core");
+ if (IS_ERR(priv->dram_core)) {
+ ret = PTR_ERR(priv->dram_core);
+ dev_err(dev, "failed to fetch core clock: %d\n", ret);
+ return ret;
+ }
priv->dram_pll = devm_clk_get(dev, "pll");
+ if (IS_ERR(priv->dram_pll)) {
+ ret = PTR_ERR(priv->dram_pll);
+ dev_err(dev, "failed to fetch pll clock: %d\n", ret);
+ return ret;
+ }
priv->dram_alt = devm_clk_get(dev, "alt");
+ if (IS_ERR(priv->dram_alt)) {
+ ret = PTR_ERR(priv->dram_alt);
+ dev_err(dev, "failed to fetch alt clock: %d\n", ret);
+ return ret;
+ }
priv->dram_apb = devm_clk_get(dev, "apb");
- if (IS_ERR(priv->dram_core) ||
- IS_ERR(priv->dram_pll) ||
- IS_ERR(priv->dram_alt) ||
- IS_ERR(priv->dram_apb)) {
- ret = PTR_ERR(priv->devfreq);
- dev_err(dev, "failed to fetch clocks: %d\n", ret);
+ if (IS_ERR(priv->dram_apb)) {
+ ret = PTR_ERR(priv->dram_apb);
+ dev_err(dev, "failed to fetch apb clock: %d\n", ret);
return ret;
}

--
2.7.4

2019-12-30 17:36:38

by Chanwoo Choi

Subject: Re: [PATCH -next] PM / devfreq: imx8m-ddrc: Fix inconsistent IS_ERR and PTR_ERR

On Mon, Dec 30, 2019 at 5:58 PM YueHaibing <[email protected]> wrote:
>
> Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe().
> Detected using Coccinelle.
>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> drivers/devfreq/imx8m-ddrc.c | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/devfreq/imx8m-ddrc.c b/drivers/devfreq/imx8m-ddrc.c
> index 53df792..bc82d36 100644
> --- a/drivers/devfreq/imx8m-ddrc.c
> +++ b/drivers/devfreq/imx8m-ddrc.c
> @@ -395,15 +395,27 @@ static int imx8m_ddrc_probe(struct platform_device *pdev)
> }
>
> priv->dram_core = devm_clk_get(dev, "core");
> + if (IS_ERR(priv->dram_core)) {
> + ret = PTR_ERR(priv->dram_core);
> + dev_err(dev, "failed to fetch core clock: %d\n", ret);

If there is no special reason, just use 'get' instead of ' fetch' word.
s/fetch/get

> + return ret;
> + }
> priv->dram_pll = devm_clk_get(dev, "pll");
> + if (IS_ERR(priv->dram_pll)) {
> + ret = PTR_ERR(priv->dram_pll);
> + dev_err(dev, "failed to fetch pll clock: %d\n", ret);

ditto.

> + return ret;
> + }
> priv->dram_alt = devm_clk_get(dev, "alt");
> + if (IS_ERR(priv->dram_alt)) {
> + ret = PTR_ERR(priv->dram_alt);
> + dev_err(dev, "failed to fetch alt clock: %d\n", ret);

ditto.

> + return ret;
> + }
> priv->dram_apb = devm_clk_get(dev, "apb");
> - if (IS_ERR(priv->dram_core) ||
> - IS_ERR(priv->dram_pll) ||
> - IS_ERR(priv->dram_alt) ||
> - IS_ERR(priv->dram_apb)) {
> - ret = PTR_ERR(priv->devfreq);
> - dev_err(dev, "failed to fetch clocks: %d\n", ret);
> + if (IS_ERR(priv->dram_apb)) {
> + ret = PTR_ERR(priv->dram_apb);
> + dev_err(dev, "failed to fetch apb clock: %d\n", ret);

ditto.

> return ret;
> }
>
> --
> 2.7.4
>
>


--
Best Regards,
Chanwoo Choi

2019-12-30 18:10:44

by Chanwoo Choi

Subject: Re: [PATCH -next] PM / devfreq: imx8m-ddrc: Fix inconsistent IS_ERR and PTR_ERR

On Tue, Dec 31, 2019 at 2:35 AM Chanwoo Choi <[email protected]> wrote:
>
> On Mon, Dec 30, 2019 at 5:58 PM YueHaibing <[email protected]> wrote:
> >
> > Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe().
> > Detected using Coccinelle.
> >
> > Signed-off-by: YueHaibing <[email protected]>
> > ---
> > drivers/devfreq/imx8m-ddrc.c | 24 ++++++++++++++++++------
> > 1 file changed, 18 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/devfreq/imx8m-ddrc.c b/drivers/devfreq/imx8m-ddrc.c
> > index 53df792..bc82d36 100644
> > --- a/drivers/devfreq/imx8m-ddrc.c
> > +++ b/drivers/devfreq/imx8m-ddrc.c
> > @@ -395,15 +395,27 @@ static int imx8m_ddrc_probe(struct platform_device *pdev)
> > }
> >
> > priv->dram_core = devm_clk_get(dev, "core");
> > + if (IS_ERR(priv->dram_core)) {
> > + ret = PTR_ERR(priv->dram_core);
> > + dev_err(dev, "failed to fetch core clock: %d\n", ret);
>
> If there is no special reason, just use 'get' instead of ' fetch' word.
> s/fetch/get

Usually, use 'verb' included in function name to show the debug message.
But, Again thinking. the original comment used 'fetch' word. Please
ignore my comment

Applied it.

(snip)

Best Regards,
Chanwoo Choi