[Gc-linux-cvs] linux/drivers/net gcn-bba.c,1.17,1.18

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2212/drivers/net

Modified Files:
	gcn-bba.c 
Log Message:
[PATCH] gcn-bba: fix two "mixed declarations and code" ISO C90 warnings

From: Albert Herranz <alb...@ya...>
Date: Sun, 1 Mar 2009 23:40:21 +0100
Subject: [PATCH] gcn-bba: fix two "mixed declarations and code" ISO C90 warnings

Fix the following two warnings:

drivers/net/gcn-bba.c: In function 'bba_calc_response':
drivers/net/gcn-bba.c:964: warning: ISO C90 forbids mixed declarations
and code
drivers/net/gcn-bba.c:970: warning: ISO C90 forbids mixed declarations
and code

Signed-off-by: Albert Herranz <alb...@ya...>


Index: gcn-bba.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gcn-bba.c	2 Mar 2009 18:45:43 -0000	1.17
--- gcn-bba.c	2 Mar 2009 18:46:20 -0000	1.18
***************
*** 958,966 ****
  {
  	u8 revid_0, revid_eth_0, revid_eth_1;
  	revid_0 = priv->revid;
  	revid_eth_0 = priv->__0x04_init[0];
  	revid_eth_1 = priv->__0x04_init[1];
  
- 	u8 i0, i1, i2, i3;
  	i0 = val >> 24;
  	i1 = val >> 16;
--- 958,968 ----
  {
  	u8 revid_0, revid_eth_0, revid_eth_1;
+ 	u8 i0, i1, i2, i3;
+ 	u8 c0, c1, c2, c3;
+ 
  	revid_0 = priv->revid;
  	revid_eth_0 = priv->__0x04_init[0];
  	revid_eth_1 = priv->__0x04_init[1];
  
  	i0 = val >> 24;
  	i1 = val >> 16;
***************
*** 968,972 ****
  	i3 = val;
  
- 	u8 c0, c1, c2, c3;
  	c0 = (i0 + i1 * 0xc1 + 0x18 + revid_0) ^ (i3 * i2 + 0x90);
  	c1 = (i1 + i2 + 0x90) ^ (c0 + i0 - 0xc1);
--- 970,973 ----