Commit 7c34eb89 authored by Hannes Eder's avatar Hannes Eder Committed by David S. Miller

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: default avatarHannes Eder <hannes@hanneseder.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d7dce76
...@@ -2284,7 +2284,6 @@ static int serdes_init_10g_serdes(struct niu *np) ...@@ -2284,7 +2284,6 @@ static int serdes_init_10g_serdes(struct niu *np)
struct niu_link_config *lp = &np->link_config; struct niu_link_config *lp = &np->link_config;
unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i; unsigned long ctrl_reg, test_cfg_reg, pll_cfg, i;
u64 ctrl_val, test_cfg_val, sig, mask, val; u64 ctrl_val, test_cfg_val, sig, mask, val;
int err;
u64 reset_val; u64 reset_val;
switch (np->port) { switch (np->port) {
...@@ -2337,6 +2336,7 @@ static int serdes_init_10g_serdes(struct niu *np) ...@@ -2337,6 +2336,7 @@ static int serdes_init_10g_serdes(struct niu *np)
/* Initialize all 4 lanes of the SERDES. */ /* Initialize all 4 lanes of the SERDES. */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
u32 rxtx_ctrl, glue0; u32 rxtx_ctrl, glue0;
int err;
err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl); err = esr_read_rxtx_ctrl(np, i, &rxtx_ctrl);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment