diff options
author | Denis Kirjanov <dkirjanov@hera.kernel.org> | 2010-09-03 06:05:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-06 21:15:36 -0400 |
commit | 7457e911c72eb0041b007943b0a29aab5a1c4a39 (patch) | |
tree | 9129312fcda00061657ecb20061bbcbdcc4cc11c /drivers/net/ns83820.c | |
parent | d1fb62796cdac6899ebd4319e4a610684db063e9 (diff) |
ns83820: Remove unused have_optical variable.
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 4475ca97f031..b3cebb1204f1 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
@@ -1246,7 +1246,6 @@ static int ns83820_get_settings(struct net_device *ndev, | |||
1246 | { | 1246 | { |
1247 | struct ns83820 *dev = PRIV(ndev); | 1247 | struct ns83820 *dev = PRIV(ndev); |
1248 | u32 cfg, tanar, tbicr; | 1248 | u32 cfg, tanar, tbicr; |
1249 | int have_optical = 0; | ||
1250 | int fullduplex = 0; | 1249 | int fullduplex = 0; |
1251 | 1250 | ||
1252 | /* | 1251 | /* |
@@ -1267,15 +1266,7 @@ static int ns83820_get_settings(struct net_device *ndev, | |||
1267 | tanar = readl(dev->base + TANAR); | 1266 | tanar = readl(dev->base + TANAR); |
1268 | tbicr = readl(dev->base + TBICR); | 1267 | tbicr = readl(dev->base + TBICR); |
1269 | 1268 | ||
1270 | if (dev->CFG_cache & CFG_TBI_EN) { | 1269 | fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; |
1271 | /* we have an optical interface */ | ||
1272 | have_optical = 1; | ||
1273 | fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; | ||
1274 | |||
1275 | } else { | ||
1276 | /* We have copper */ | ||
1277 | fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0; | ||
1278 | } | ||
1279 | 1270 | ||
1280 | cmd->supported = SUPPORTED_Autoneg; | 1271 | cmd->supported = SUPPORTED_Autoneg; |
1281 | 1272 | ||