2010-11-26 17:06:17

by Vasily Kulikov

Subject: [PATCH] arm: plat-spear: time: use IS_ERR() instead of NULL check

clk_get() returns ERR_PTR() on error, not NULL.

Signed-off-by: Vasiliy Kulikov <[email protected]>
---
Cannot compile this driver, so it is not tested at all.

arch/arm/plat-spear/time.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
index ab21165..678df18 100644
--- a/arch/arm/plat-spear/time.c
+++ b/arch/arm/plat-spear/time.c
@@ -229,13 +229,13 @@ void __init spear_setup_timer(void)
}

gpt_clk = clk_get_sys("gpt0", NULL);
- if (!gpt_clk) {
+ if (IS_ERR(gpt_clk)) {
pr_err("%s:couldn't get clk for gpt\n", __func__);
goto err_iomap;
}

pll3_clk = clk_get(NULL, "pll3_48m_clk");
- if (!pll3_clk) {
+ if (IS_ERR(pll3_clk)) {
pr_err("%s:couldn't get PLL3 as parent for gpt\n", __func__);
goto err_iomap;
}
--
1.7.0.4

2010-11-29 06:32:11

by viresh kumar

Subject: Re: [PATCH] arm: plat-spear: time: use IS_ERR() instead of NULL check

On Fri, Nov 26, 2010 at 10:36 PM, Vasiliy Kulikov <[email protected]> wrote:
> clk_get() returns ERR_PTR() on error, not NULL.
>
> Signed-off-by: Vasiliy Kulikov <[email protected]>
> ---
>  Cannot compile this driver, so it is not tested at all.
>
>  arch/arm/plat-spear/time.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
> index ab21165..678df18 100644
> --- a/arch/arm/plat-spear/time.c
> +++ b/arch/arm/plat-spear/time.c
> @@ -229,13 +229,13 @@ void __init spear_setup_timer(void)
>        }
>
>        gpt_clk = clk_get_sys("gpt0", NULL);
> -       if (!gpt_clk) {
> +       if (IS_ERR(gpt_clk)) {
>                pr_err("%s:couldn't get clk for gpt\n", __func__);
>                goto err_iomap;
>        }
>
>        pll3_clk = clk_get(NULL, "pll3_48m_clk");
> -       if (!pll3_clk) {
> +       if (IS_ERR(pll3_clk)) {
>                pr_err("%s:couldn't get PLL3 as parent for gpt\n", __func__);
>                goto err_iomap;
>        }

Compiled & tested.

Acked-by: Viresh Kumar <[email protected]>