Commit 7fdc455e authored by Russell King's avatar Russell King Committed by David S. Miller

net: phylink: remove netdev from phylink mii ioctl emulation

The netdev used in the phylink ioctl emulation is never used, so let's
remove it.
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4b12b0d
...@@ -1395,8 +1395,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_eee); ...@@ -1395,8 +1395,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_eee);
* *
* FIXME: should deal with negotiation state too. * FIXME: should deal with negotiation state too.
*/ */
static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg, static int phylink_mii_emul_read(unsigned int reg,
struct phylink_link_state *state, bool aneg) struct phylink_link_state *state)
{ {
struct fixed_phy_status fs; struct fixed_phy_status fs;
int val; int val;
...@@ -1411,8 +1411,6 @@ static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg, ...@@ -1411,8 +1411,6 @@ static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg,
if (reg == MII_BMSR) { if (reg == MII_BMSR) {
if (!state->an_complete) if (!state->an_complete)
val &= ~BMSR_ANEGCOMPLETE; val &= ~BMSR_ANEGCOMPLETE;
if (!aneg)
val &= ~BMSR_ANEGCAPABLE;
} }
return val; return val;
} }
...@@ -1508,8 +1506,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned int phy_id, ...@@ -1508,8 +1506,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned int phy_id,
case MLO_AN_FIXED: case MLO_AN_FIXED:
if (phy_id == 0) { if (phy_id == 0) {
phylink_get_fixed_state(pl, &state); phylink_get_fixed_state(pl, &state);
val = phylink_mii_emul_read(pl->netdev, reg, &state, val = phylink_mii_emul_read(reg, &state);
true);
} }
break; break;
...@@ -1522,8 +1519,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned int phy_id, ...@@ -1522,8 +1519,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned int phy_id,
if (val < 0) if (val < 0)
return val; return val;
val = phylink_mii_emul_read(pl->netdev, reg, &state, val = phylink_mii_emul_read(reg, &state);
true);
} }
break; break;
} }
......
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