summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@hera.kernel.org>2010-09-03 10:05:39 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-06 18:15:36 -0700
commit7457e911c72eb0041b007943b0a29aab5a1c4a39 (patch)
tree9129312fcda00061657ecb20061bbcbdcc4cc11c
parentd1fb62796cdac6899ebd4319e4a610684db063e9 (diff)
downloadop-kernel-dev-7457e911c72eb0041b007943b0a29aab5a1c4a39.zip
op-kernel-dev-7457e911c72eb0041b007943b0a29aab5a1c4a39.tar.gz
ns83820: Remove unused have_optical variable.
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ns83820.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 4475ca9..b3cebb12 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1246,7 +1246,6 @@ static int ns83820_get_settings(struct net_device *ndev,
{
struct ns83820 *dev = PRIV(ndev);
u32 cfg, tanar, tbicr;
- int have_optical = 0;
int fullduplex = 0;
/*
@@ -1267,15 +1266,7 @@ static int ns83820_get_settings(struct net_device *ndev,
tanar = readl(dev->base + TANAR);
tbicr = readl(dev->base + TBICR);
- if (dev->CFG_cache & CFG_TBI_EN) {
- /* we have an optical interface */
- have_optical = 1;
- fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0;
-
- } else {
- /* We have copper */
- fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0;
- }
+ fullduplex = (cfg & CFG_DUPSTS) ? 1 : 0;
cmd->supported = SUPPORTED_Autoneg;
OpenPOWER on IntegriCloud