projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d1fb627
)
ns83820: Remove unused have_optical variable.
author
Denis Kirjanov
<
[email protected]
>
Fri, 3 Sep 2010 10:05:39 +0000
(10:05 +0000)
committer
David S. Miller
<
[email protected]
>
Tue, 7 Sep 2010 01:15:36 +0000
(18:15 -0700)
Signed-off-by: Denis Kirjanov <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ns83820.c
patch
|
blob
|
history
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index 4475ca97f031b6fbf6ca8f4b99b2591e147730de..b3cebb1204f1beaa26cb00ab849178f0319b8b39 100644
(file)
--- 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;