drivers/net/wireless: fix sparse warnings: symbol shadows an earlier one

Impact:
  Move variable closer to usage resp.
  remove redundant variables resp.
  rename function scope variable.

Fix this sparse warnings:
  drivers/net/wireless/airo.c:3840:29: warning: symbol 'i' shadows an earlier one
  drivers/net/wireless/airo.c:3751:13: originally declared here
  drivers/net/wireless/airo.c:3847:29: warning: symbol 'i' shadows an earlier one
  drivers/net/wireless/airo.c:3751:13: originally declared here
  drivers/net/wireless/airo.c:3861:21: warning: symbol 'i' shadows an earlier one
  drivers/net/wireless/airo.c:3751:13: originally declared here
  drivers/net/wireless/wavelan.c:43:13: warning: symbol 'irq' shadows an earlier one
  drivers/net/wireless/wavelan.p.h:692:17: originally declared here

Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 5 insertions, 7 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index acda45838e98..7e5cd15e59ad 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -3748,7 +3748,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
         Cmd cmd;
         Resp rsp;
         int status;
-        int i;
         SsidRid mySsid;
         __le16 lastindex;
         WepKeyRid wkr;
@@ -3790,6 +3789,7 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
         if (lock)
                 up(&ai->sem);
         if (ai->config.len == 0) {
+                int i;
                 tdsRssiRid rssi_rid;
                 CapabilityRid cap_rid;
 
@@ -3837,14 +3837,12 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
                 /* Check to see if there are any insmod configured
                    rates to add */
                 if ( rates[0] ) {
-                        int i = 0;
                         memset(ai->config.rates,0,sizeof(ai->config.rates));
                         for( i = 0; i < 8 && rates[i]; i++ ) {
                                 ai->config.rates[i] = rates[i];
                         }
                 }
                 if ( basic_rate > 0 ) {
-                        int i;
                         for( i = 0; i < 8; i++ ) {
                                 if ( ai->config.rates[i] == basic_rate ||
                                      !ai->config.rates ) {
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index 832679396b6c..688bdea8f13a 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -40,11 +40,11 @@ static u8 wv_irq_to_psa(int irq)
  */
 static int __init wv_psa_to_irq(u8 irqval)
 {
-        int irq;
+        int i;
 
-        for (irq = 0; irq < ARRAY_SIZE(irqvals); irq++)
-                if (irqvals[irq] == irqval)
-                        return irq;
+        for (i = 0; i < ARRAY_SIZE(irqvals); i++)
+                if (irqvals[i] == irqval)
+                        return i;
 
         return -1;
 }