diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 06:41:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-17 20:37:59 -0500 |
commit | 37d37695ef34b04ecf20586c12ec0c932283a130 (patch) | |
tree | e4a750210d144b6f327b2a1eb73632ca001e912e | |
parent | 6ae038512ced0f179abd4d2387786cc69d2fb801 (diff) |
drivers/net/sfc: fix sparse warning: symbol shadows an earlier one
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 <hannes@hanneseder.net>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/sfc/tenxpress.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index ac9eeab79f20..5b0f45166628 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) | |||
572 | static void tenxpress_phy_poll(struct efx_nic *efx) | 572 | static void tenxpress_phy_poll(struct efx_nic *efx) |
573 | { | 573 | { |
574 | struct tenxpress_phy_data *phy_data = efx->phy_data; | 574 | struct tenxpress_phy_data *phy_data = efx->phy_data; |
575 | bool change = false, link_ok; | 575 | bool change = false; |
576 | unsigned link_fc; | ||
577 | 576 | ||
578 | if (efx->phy_type == PHY_TYPE_SFX7101) { | 577 | if (efx->phy_type == PHY_TYPE_SFX7101) { |
579 | link_ok = sfx7101_link_ok(efx); | 578 | bool link_ok = sfx7101_link_ok(efx); |
580 | if (link_ok != efx->link_up) { | 579 | if (link_ok != efx->link_up) { |
581 | change = true; | 580 | change = true; |
582 | } else { | 581 | } else { |
583 | link_fc = mdio_clause45_get_pause(efx); | 582 | unsigned int link_fc = mdio_clause45_get_pause(efx); |
584 | if (link_fc != efx->link_fc) | 583 | if (link_fc != efx->link_fc) |
585 | change = true; | 584 | change = true; |
586 | } | 585 | } |