From patchwork Sat Feb 14 21:41:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Eder X-Patchwork-Id: 23172 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 F2822DDD1C for ; Sun, 15 Feb 2009 08:41:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbZBNVlM (ORCPT ); Sat, 14 Feb 2009 16:41:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752573AbZBNVlK (ORCPT ); Sat, 14 Feb 2009 16:41:10 -0500 Received: from mail-fx0-f25.google.com ([209.85.220.25]:42497 "EHLO mail-fx0-f25.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbZBNVlJ (ORCPT ); Sat, 14 Feb 2009 16:41:09 -0500 Received: by fxm6 with SMTP id 6so1107519fxm.13 for ; Sat, 14 Feb 2009 13:41:06 -0800 (PST) Received: by 10.103.226.10 with SMTP id d10mr623981mur.84.1234647666315; Sat, 14 Feb 2009 13:41:06 -0800 (PST) Received: from vmbox.hanneseder.net (chello080109038207.17.14.tuwien.teleweb.at [80.109.38.207]) by mx.google.com with ESMTPS id n10sm5972001mue.9.2009.02.14.13.41.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 14 Feb 2009 13:41:05 -0800 (PST) Received: by vmbox.hanneseder.net (sSMTP sendmail emulation); Sat, 14 Feb 2009 22:41:03 +0100 From: Hannes Eder Subject: [PATCH 26/43] drivers/net/sfc: fix sparse warning: 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:41:03 +0100 Message-ID: <20090214213932.24377.94262.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 declaration as close to their usage as possible. Fix this sparse warning: drivers/net/sfc/tenxpress.c:589:22: warning: symbol 'link_ok' shadows an earlier one drivers/net/sfc/tenxpress.c:575:30: originally declared here Signed-off-by: Hannes Eder Acked-by: Ben Hutchings --- drivers/net/sfc/tenxpress.c | 7 +++---- 1 files changed, 3 insertions(+), 4 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/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index ac9eeab..5b0f451 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c @@ -572,15 +572,14 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx) static void tenxpress_phy_poll(struct efx_nic *efx) { struct tenxpress_phy_data *phy_data = efx->phy_data; - bool change = false, link_ok; - unsigned link_fc; + bool change = false; if (efx->phy_type == PHY_TYPE_SFX7101) { - link_ok = sfx7101_link_ok(efx); + bool link_ok = sfx7101_link_ok(efx); if (link_ok != efx->link_up) { change = true; } else { - link_fc = mdio_clause45_get_pause(efx); + unsigned int link_fc = mdio_clause45_get_pause(efx); if (link_fc != efx->link_fc) change = true; }