]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: phylink: remove netdev from phylink mii ioctl emulation
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 28 May 2019 09:57:18 +0000 (10:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 May 2019 19:37:46 +0000 (12:37 -0700)
The netdev used in the phylink ioctl emulation is never used, so let's
remove it.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phylink.c

index b7300ea2663c47b4bac1e3f7875c564710206ab7..e4c947e8a6e3228b8a4f10c97459fb83724b41c6 100644 (file)
@@ -1395,8 +1395,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;
@@ -1411,8 +1411,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;
 }
@@ -1508,8 +1506,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;
 
@@ -1522,8 +1519,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;
        }