From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755599AbZBOUKg (ORCPT ); Sun, 15 Feb 2009 15:10:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752285AbZBOUKW (ORCPT ); Sun, 15 Feb 2009 15:10:22 -0500 Received: from mail-bw0-f167.google.com ([209.85.218.167]:34081 "EHLO mail-bw0-f167.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755AbZBOUKV (ORCPT ); Sun, 15 Feb 2009 15:10:21 -0500 MIME-Version: 1.0 In-Reply-To: <49982331.4050001@bfs.de> References: <20090214210940.23489.95001.stgit@vmbox.hanneseder.net> <20090214211557.23489.75670.stgit@vmbox.hanneseder.net> <49982331.4050001@bfs.de> Date: Sun, 15 Feb 2009 21:10:18 +0100 Message-ID: <154e089b0902151210t4eba8c96le0343b722f47b169@mail.gmail.com> Subject: Re: [PATCH 16/43] drivers/net/cxgb3: fix sparse warning: symbol shadows an earlier one From: Hannes Eder To: wharms@bfs.de Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Feb 15, 2009 at 3:14 PM, walter harms wrote: > Hannes Eder schrieb: >> Impact: Move variable declaration as close to usage as possible. >> >> Fix this sparse warning: >> drivers/net/cxgb3/cxgb3_main.c:1586:21: warning: symbol 'cap' shadows an earlier one >> >> Signed-off-by: Hannes Eder >> --- >> drivers/net/cxgb3/cxgb3_main.c | 3 +-- >> 1 files changed, 1 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c >> index f2c7cc3..0f6062a 100644 >> --- a/drivers/net/cxgb3/cxgb3_main.c >> +++ b/drivers/net/cxgb3/cxgb3_main.c >> @@ -1565,7 +1565,6 @@ static int speed_duplex_to_caps(int speed, int duplex) >> >> static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd) >> { >> - int cap; >> struct port_info *p = netdev_priv(dev); >> struct link_config *lc = &p->link_config; >> >> @@ -1575,7 +1574,7 @@ static int set_settings(struct net_device *dev, struct ethtool_cmd *cmd) >> * being requested. >> */ >> if (cmd->autoneg == AUTONEG_DISABLE) { >> - cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); >> + int cap = speed_duplex_to_caps(cmd->speed, cmd->duplex); >> if (lc->supported & cap) >> return 0; >> } >> > > Hello Hannes, > it seems that "cap" can be dropped completely. > > if (lc->supported & speed_duplex_to_caps(cmd->speed, cmd->duplex) ) > return 0; Hi Walter, You are right, but we would hit the 80 characters per line limit, 90 in this case, and a similar construct is used a few lines below so I suggest to leave it this way. -Hannes