Skip to content

Commit

Permalink
net: dsa: use phy_ethtool_nway_reset
Browse files Browse the repository at this point in the history
Use phy_ethtool_nway_reset now that dsa_slave_nway_reset does exactly
the same.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vivien Didelot authored and David S. Miller committed Sep 27, 2017
1 parent aa62a8c commit 69b2c16
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions net/dsa/slave.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,14 +450,6 @@ dsa_slave_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
ds->ops->get_regs(ds, p->dp->index, regs, _p);
}

static int dsa_slave_nway_reset(struct net_device *dev)
{
if (!dev->phydev)
return -ENODEV;

return genphy_restart_aneg(dev->phydev);
}

static u32 dsa_slave_get_link(struct net_device *dev)
{
if (!dev->phydev)
Expand Down Expand Up @@ -888,7 +880,7 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
.get_drvinfo = dsa_slave_get_drvinfo,
.get_regs_len = dsa_slave_get_regs_len,
.get_regs = dsa_slave_get_regs,
.nway_reset = dsa_slave_nway_reset,
.nway_reset = phy_ethtool_nway_reset,
.get_link = dsa_slave_get_link,
.get_eeprom_len = dsa_slave_get_eeprom_len,
.get_eeprom = dsa_slave_get_eeprom,
Expand Down

0 comments on commit 69b2c16

Please sign in to comment.