aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-09 07:10:25 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-10 18:55:24 -0500
commited4ba4b5b96742d29225308ccccbdb1810b63064 (patch)
tree2c28a534d7b7fe4ed58925401d69b14df90323be /drivers/net/mv643xx_eth.c
parente596e6e4d578f2639416e620d367a3af34814a40 (diff)
netdev: Use default implementation of ethtool_ops::get_link where possible
Various drivers are using implementations of ethtool_ops::get_link that are equivalent to the default ethtool_op_get_link(). Change them to use that instead. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index dd2b6a71c6d..ce31e74a559 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1514,11 +1514,6 @@ static int mv643xx_eth_nway_reset(struct net_device *dev)
1514 return genphy_restart_aneg(mp->phy); 1514 return genphy_restart_aneg(mp->phy);
1515} 1515}
1516 1516
1517static u32 mv643xx_eth_get_link(struct net_device *dev)
1518{
1519 return !!netif_carrier_ok(dev);
1520}
1521
1522static int 1517static int
1523mv643xx_eth_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) 1518mv643xx_eth_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
1524{ 1519{
@@ -1658,7 +1653,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
1658 .set_settings = mv643xx_eth_set_settings, 1653 .set_settings = mv643xx_eth_set_settings,
1659 .get_drvinfo = mv643xx_eth_get_drvinfo, 1654 .get_drvinfo = mv643xx_eth_get_drvinfo,
1660 .nway_reset = mv643xx_eth_nway_reset, 1655 .nway_reset = mv643xx_eth_nway_reset,
1661 .get_link = mv643xx_eth_get_link, 1656 .get_link = ethtool_op_get_link,
1662 .get_coalesce = mv643xx_eth_get_coalesce, 1657 .get_coalesce = mv643xx_eth_get_coalesce,
1663 .set_coalesce = mv643xx_eth_set_coalesce, 1658 .set_coalesce = mv643xx_eth_set_coalesce,
1664 .get_ringparam = mv643xx_eth_get_ringparam, 1659 .get_ringparam = mv643xx_eth_get_ringparam,