From patchwork Sat Feb 14 21:49:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Eder X-Patchwork-Id: 23184 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A116BDDD1B for ; Sun, 15 Feb 2009 08:50:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755592AbZBNVtS (ORCPT ); Sat, 14 Feb 2009 16:49:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755578AbZBNVtR (ORCPT ); Sat, 14 Feb 2009 16:49:17 -0500 Received: from mail-fx0-f25.google.com ([209.85.220.25]:64702 "EHLO mail-fx0-f25.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755559AbZBNVtP (ORCPT ); Sat, 14 Feb 2009 16:49:15 -0500 Received: by fxm6 with SMTP id 6so1108659fxm.13 for ; Sat, 14 Feb 2009 13:49:12 -0800 (PST) Received: by 10.103.189.15 with SMTP id r15mr2079001mup.126.1234648152332; Sat, 14 Feb 2009 13:49:12 -0800 (PST) Received: from vmbox.hanneseder.net (chello080109038207.17.14.tuwien.teleweb.at [80.109.38.207]) by mx.google.com with ESMTPS id y2sm2037019mug.15.2009.02.14.13.49.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 14 Feb 2009 13:49:11 -0800 (PST) Received: by vmbox.hanneseder.net (sSMTP sendmail emulation); Sat, 14 Feb 2009 22:49:09 +0100 From: Hannes Eder Subject: [PATCH 38/43] drivers/net/wireless: fix sparse warnings: symbol shadows an earlier one To: netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sat, 14 Feb 2009 22:49:09 +0100 Message-ID: <20090214214852.24377.70239.stgit@vmbox.hanneseder.net> In-Reply-To: <20090214210940.23489.95001.stgit@vmbox.hanneseder.net> References: <20090214210940.23489.95001.stgit@vmbox.hanneseder.net> User-Agent: StGit/0.14.3.348.gcb02 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/wireless/airo.c | 4 +--- drivers/net/wireless/wavelan.c | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 308603e..220f00b 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 8326793..688bdea 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; }