diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 06:12:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-17 20:21:10 -0500 |
commit | 7c34eb897362a51133222ef4229628469333f4d9 (patch) | |
tree | aa7ed6cbb4e4e5c30dab197c7af883788264c2ba /drivers/net/niu.c | |
parent | 5d7dce76c51a590fdd7616285a96825aa517ede0 (diff) |
drivers/net/niu.c: fix sparse warning: symbol shadows an earlier one
Impact: Move variable declaration to a more inner scope.
Fix this sparse warning:
drivers/net/niu.c:2399:21: warning: symbol 'err' shadows an earlier one
drivers/net/niu.c:2287:13: originally declared here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index c26325ded20e..32374a1c123b 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -2284,7 +2284,6 @@ static int serdes_init_10g_serdes(struct niu *np) | |||
2284 | struct niu_link_config *lp = &np->link_config; | 2284 | struct niu_link_config *lp = &np->link_config; |
2285 | unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i; | 2285 | unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i; |
2286 | u64 ctrl_val, test_cfg_val, sig, mask, val; | 2286 | u64 ctrl_val, test_cfg_val, sig, mask, val; |
2287 | int err; | ||
2288 | u64 reset_val; | 2287 | u64 reset_val; |
2289 | 2288 | ||
2290 | switch (np->port) { | 2289 | switch (np->port) { |
@@ -2337,6 +2336,7 @@ static int serdes_init_10g_serdes(struct niu *np) | |||
2337 | /* Initialize all 4 lanes of the SERDES. */ | 2336 | /* Initialize all 4 lanes of the SERDES. */ |
2338 | for (i = 0; i < 4; i++) { | 2337 | for (i = 0; i < 4; i++) { |
2339 | u32 rxtx_ctrl, glue0; | 2338 | u32 rxtx_ctrl, glue0; |
2339 | int err; | ||
2340 | 2340 | ||
2341 | err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl); | 2341 | err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl); |
2342 | if (err) | 2342 | if (err) |