2010-11-26 17:06:12

by Vasily Kulikov

Subject: [PATCH] arm: plat-omap: counter_32k: 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-omap/counter_32k.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
index 155fe43..c1e0d00 100644
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@ -164,7 +164,7 @@ static int __init omap_init_clocksource_32k(void)
return -ENODEV;

sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
- if (sync_32k_ick)
+ if (!IS_ERR(sync_32k_ick))
clk_enable(sync_32k_ick);

clocksource_32k.mult = clocksource_hz2mult(32768,
--
1.7.0.4

2010-11-29 15:29:36

by Kevin Hilman

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

Vasiliy Kulikov <[email protected]> writes:

> clk_get() returns ERR_PTR() on error, not NULL.
>
> Signed-off-by: Vasiliy Kulikov <[email protected]>

Acked-by: Kevin Hilman <[email protected]>

> ---
> Cannot compile this driver, so it is not tested at all.
>
> arch/arm/plat-omap/counter_32k.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
> index 155fe43..c1e0d00 100644
> --- a/arch/arm/plat-omap/counter_32k.c
> +++ b/arch/arm/plat-omap/counter_32k.c
> @@ -164,7 +164,7 @@ static int __init omap_init_clocksource_32k(void)
> return -ENODEV;
>
> sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
> - if (sync_32k_ick)
> + if (!IS_ERR(sync_32k_ick))
> clk_enable(sync_32k_ick);
>
> clocksource_32k.mult = clocksource_hz2mult(32768,

2010-12-06 23:52:14

by Tony Lindgren

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

* Vasiliy Kulikov <[email protected]> [101126 08:56]:
> 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.

Thanks will merge this.

Tony

>
> arch/arm/plat-omap/counter_32k.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c
> index 155fe43..c1e0d00 100644
> --- a/arch/arm/plat-omap/counter_32k.c
> +++ b/arch/arm/plat-omap/counter_32k.c
> @@ -164,7 +164,7 @@ static int __init omap_init_clocksource_32k(void)
> return -ENODEV;
>
> sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
> - if (sync_32k_ick)
> + if (!IS_ERR(sync_32k_ick))
> clk_enable(sync_32k_ick);
>
> clocksource_32k.mult = clocksource_hz2mult(32768,
> --
> 1.7.0.4
>