powermac/low_i2c.c: three minor problems

powermac/low_i2c.c: three minor problems

[d binderman]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]



Hello there,

I just ran the sourceforge tool cppcheck over the source code of the
new Linux kernel 2.6.33-rc6

It said

[./arch/powerpc/platforms/powermac/low_i2c.c:594]: (style) The scope of the variable chans can be reduced
[./arch/powerpc/platforms/powermac/low_i2c.c:594]: (style) The scope of the variable i can be reduced
[./arch/powerpc/platforms/powermac/low_i2c.c:1260]: (style) Redundant condition. It is safe to deallocate a NULL pointer

Please find attached a patch to fix these minor problems.  
The patched version compiles, but I have not been able to test it at run time.

Regards

David Binderman
 		 	   		  
_________________________________________________________________
Do you have a story that started on Hotmail? Tell us now
http://clk.atdmt.com/UKM/go/195013117/direct/01/

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: bug30.patch --]
[-- Type: text/x-patch, Size: 883 bytes --]

--- arch/powerpc/platforms/powermac/low_i2c.c.sav	2010-02-06 11:52:21.000000000 +0000
+++ arch/powerpc/platforms/powermac/low_i2c.c	2010-02-06 11:53:07.000000000 +0000
@@ -591,7 +591,7 @@ static void __init kw_i2c_probe(void)
 	/* Probe keywest-i2c busses */
 	for_each_compatible_node(np, "i2c","keywest-i2c") {
 		struct pmac_i2c_host_kw *host;
-		int multibus, chans, i;
+		int multibus;
 
 		/* Found one, init a host structure */
 		host = kw_i2c_host_init(np);
@@ -613,6 +613,8 @@ static void __init kw_i2c_probe(void)
 		 * parent type
 		 */
 		if (multibus) {
+			int chans, i;
+
 			parent = of_get_parent(np);
 			if (parent == NULL)
 				continue;
@@ -1257,8 +1259,7 @@ static void pmac_i2c_do_end(struct pmf_f
 	if (inst == NULL)
 		return;
 	pmac_i2c_close(inst->bus);
-	if (inst)
-		kfree(inst);
+	kfree(inst);
 }
 
 static int pmac_i2c_do_read(PMF_STD_ARGS, u32 len)

Re: powermac/low_i2c.c: three minor problems

[Benjamin Herrenschmidt]

On Sat, 2010-02-06 at 12:13 +0000, d binderman wrote:
> 
> Hello there,
> 
> I just ran the sourceforge tool cppcheck over the source code of the
> new Linux kernel 2.6.33-rc6

Hi !

All your patches have various problems with the actual patch format.

Patches should be submitted so that they apply with patch -p1, yours
don't. In fact, the base directory you diffed from seems to differ from
patch to patch. I'm manually fixing those this time around, but please
get that sorted out before you submit a new batch.

Cheers,
Ben.

> It said
> 
> [./arch/powerpc/platforms/powermac/low_i2c.c:594]: (style) The scope of the variable chans can be reduced
> [./arch/powerpc/platforms/powermac/low_i2c.c:594]: (style) The scope of the variable i can be reduced
> [./arch/powerpc/platforms/powermac/low_i2c.c:1260]: (style) Redundant condition. It is safe to deallocate a NULL pointer
> 
> Please find attached a patch to fix these minor problems.  
> The patched version compiles, but I have not been able to test it at run time.
> 
> Regards
> 
> David Binderman
>  		 	   		  
> _________________________________________________________________
> Do you have a story that started on Hotmail? Tell us now
> http://clk.atdmt.com/UKM/go/195013117/direct/01/