diff options
| author | Hannes Eder <hannes@hanneseder.net> | 2009-02-14 11:12:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-17 17:21:10 -0800 |
| commit | 7c34eb897362a51133222ef4229628469333f4d9 (patch) | |
| tree | aa7ed6cbb4e4e5c30dab197c7af883788264c2ba /drivers/net/niu.c | |
| parent | 5d7dce76c51a590fdd7616285a96825aa517ede0 (diff) | |
| download | linux-3.10-7c34eb897362a51133222ef4229628469333f4d9.tar.gz linux-3.10-7c34eb897362a51133222ef4229628469333f4d9.tar.bz2 linux-3.10-7c34eb897362a51133222ef4229628469333f4d9.zip | |
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 c26325ded20..32374a1c123 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c @@ -2284,7 +2284,6 @@ static int serdes_init_10g_serdes(struct niu *np) struct niu_link_config *lp = &np->link_config; unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i; u64 ctrl_val, test_cfg_val, sig, mask, val; - int err; u64 reset_val; switch (np->port) { @@ -2337,6 +2336,7 @@ static int serdes_init_10g_serdes(struct niu *np) /* Initialize all 4 lanes of the SERDES. */ for (i = 0; i < 4; i++) { u32 rxtx_ctrl, glue0; + int err; err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl); if (err) |