| Message ID | 20191230084731.15776-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Chanwoo Choi |
| Headers | show |
| Series | [-next] PM / devfreq: imx8m-ddrc: Fix inconsistent IS_ERR and PTR_ERR | expand |
On Mon, Dec 30, 2019 at 5:58 PM YueHaibing <yuehaibing@huawei.com> wrote: > > Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe(). > Detected using Coccinelle. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > 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 > >
On Tue, Dec 31, 2019 at 2:35 AM Chanwoo Choi <chanwoo@kernel.org> wrote: > > On Mon, Dec 30, 2019 at 5:58 PM YueHaibing <yuehaibing@huawei.com> wrote: > > > > Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe(). > > Detected using Coccinelle. > > > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > --- > > 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
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; }
Fix inconsistent IS_ERR and PTR_ERR in imx8m_ddrc_probe(). Detected using Coccinelle. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/devfreq/imx8m-ddrc.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)