[PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[Vasiliy Kulikov]

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

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
---
 Cannot compile this driver, so it is not tested at all.

 arch/sh/boards/mach-se/7724/setup.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index c31d228..6735305 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -871,14 +871,14 @@ static int __init devices_setup(void)
 
 	/* set SPU2 clock to 83.4 MHz */
 	clk = clk_get(NULL, "spu_clk");
-	if (clk) {
+	if (!IS_ERR(clk)) {
 		clk_set_rate(clk, clk_round_rate(clk, 83333333));
 		clk_put(clk);
 	}
 
 	/* change parent of FSI A */
 	clk = clk_get(NULL, "fsia_clk");
-	if (clk) {
+	if (!IS_ERR(clk)) {
 		clk_register(&fsimcka_clk);
 		clk_set_parent(clk, &fsimcka_clk);
 		clk_set_rate(clk, 11000);
-- 
1.7.0.4

Re: [PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[Guennadi Liakhovetski]

On Fri, 26 Nov 2010, Vasiliy Kulikov wrote:

> clk_get() returns ERR_PTR() on error, not NULL.
> 
> Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>

Yep, there are, probably, a couple more of these, similar to

http://marc.info/?t\x128715350900002&r=1&w=2

Hardly required, but if you like:

Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Thanks
Guennadi

> ---
>  Cannot compile this driver, so it is not tested at all.
> 
>  arch/sh/boards/mach-se/7724/setup.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
> index c31d228..6735305 100644
> --- a/arch/sh/boards/mach-se/7724/setup.c
> +++ b/arch/sh/boards/mach-se/7724/setup.c
> @@ -871,14 +871,14 @@ static int __init devices_setup(void)
>  
>  	/* set SPU2 clock to 83.4 MHz */
>  	clk = clk_get(NULL, "spu_clk");
> -	if (clk) {
> +	if (!IS_ERR(clk)) {
>  		clk_set_rate(clk, clk_round_rate(clk, 83333333));
>  		clk_put(clk);
>  	}
>  
>  	/* change parent of FSI A */
>  	clk = clk_get(NULL, "fsia_clk");
> -	if (clk) {
> +	if (!IS_ERR(clk)) {
>  		clk_register(&fsimcka_clk);
>  		clk_set_parent(clk, &fsimcka_clk);
>  		clk_set_rate(clk, 11000);
> -- 
> 1.7.0.4
> 
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[Vasiliy Kulikov]

Hi Guennadi,

On Fri, Nov 26, 2010 at 18:38 +0100, Guennadi Liakhovetski wrote:
> On Fri, 26 Nov 2010, Vasiliy Kulikov wrote:
> > clk_get() returns ERR_PTR() on error, not NULL.
> > 
> > Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
> 
> Yep, there are, probably, a couple more of these, similar to

I found a bit more, but I'd like to get feedback on these or just see it
applied first ;)


Thanks,

-- 
Vasiliy Kulikov
http://www.openwall.com - bringing security into open computing environments

Re: [PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[Paul Mundt]

On Fri, Nov 26, 2010 at 08:45:33PM +0300, Vasiliy Kulikov wrote:
> Hi Guennadi,
> 
> On Fri, Nov 26, 2010 at 18:38 +0100, Guennadi Liakhovetski wrote:
> > On Fri, 26 Nov 2010, Vasiliy Kulikov wrote:
> > > clk_get() returns ERR_PTR() on error, not NULL.
> > > 
> > > Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
> > 
> > Yep, there are, probably, a couple more of these, similar to
> 
> I found a bit more, but I'd like to get feedback on these or just see it
> applied first ;)
> 
It's a reasonable change, yes. The old clk_get() scanned multiple lists,
and could return NULL or -ENOENT depending on which path failed. Now that
everything is consolidated through the clk_get_sys() lookup, the NULL
checks should probably all be replaced.

Re: [PATCH] sh: boards: mach-se: use IS_ERR() instead of NULL check

[Paul Mundt]

On Sat, Nov 27, 2010 at 11:23:15AM +0900, Paul Mundt wrote:
> On Fri, Nov 26, 2010 at 08:45:33PM +0300, Vasiliy Kulikov wrote:
> > Hi Guennadi,
> > 
> > On Fri, Nov 26, 2010 at 18:38 +0100, Guennadi Liakhovetski wrote:
> > > On Fri, 26 Nov 2010, Vasiliy Kulikov wrote:
> > > > clk_get() returns ERR_PTR() on error, not NULL.
> > > > 
> > > > Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
> > > 
> > > Yep, there are, probably, a couple more of these, similar to
> > 
> > I found a bit more, but I'd like to get feedback on these or just see it
> > applied first ;)
> > 
> It's a reasonable change, yes. The old clk_get() scanned multiple lists,
> and could return NULL or -ENOENT depending on which path failed. Now that
> everything is consolidated through the clk_get_sys() lookup, the NULL
> checks should probably all be replaced.

Anyways, I've applied this one now. Feel free to send updates for the
rest at your leisure.