[PATCH net-next 1/5] net: phylink: remove netdev from phylink mii ioctl emulation

[Russell King]

The netdev used in the phylink ioctl emulation is never used, so let's
remove it.

Signed-off-by: Russell King <rmk+ker...@armlinux.org.uk>
---
 drivers/net/phy/phylink.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 9044b95d2afe..219a061572d2 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1340,8 +1340,8 @@ EXPORT_SYMBOL_GPL(phylink_ethtool_set_eee);
  *
  * FIXME: should deal with negotiation state too.
  */
-static int phylink_mii_emul_read(struct net_device *ndev, unsigned int reg,
-                                struct phylink_link_state *state, bool aneg)
+static int phylink_mii_emul_read(unsigned int reg,
+                                struct phylink_link_state *state)
 {
        struct fixed_phy_status fs;
        int val;
@@ -1356,8 +1356,6 @@ static int phylink_mii_emul_read(struct net_device *ndev, 
unsigned int reg,
        if (reg == MII_BMSR) {
                if (!state->an_complete)
                        val &= ~BMSR_ANEGCOMPLETE;
-               if (!aneg)
-                       val &= ~BMSR_ANEGCAPABLE;
        }
        return val;
 }
@@ -1453,8 +1451,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned 
int phy_id,
        case MLO_AN_FIXED:
                if (phy_id == 0) {
                        phylink_get_fixed_state(pl, &state);
-                       val = phylink_mii_emul_read(pl->netdev, reg, &state,
-                                                   true);
+                       val = phylink_mii_emul_read(reg, &state);
                }
                break;
 
@@ -1467,8 +1464,7 @@ static int phylink_mii_read(struct phylink *pl, unsigned 
int phy_id,
                        if (val < 0)
                                return val;
 
-                       val = phylink_mii_emul_read(pl->netdev, reg, &state,
-                                                   true);
+                       val = phylink_mii_emul_read(reg, &state);
                }
                break;
        }
-- 
2.7.4