]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: ethernet: sun4i-emac: use phy_ethtool_{get|set}_link_ksettings
authorPhilippe Reynes <tremyfr@gmail.com>
Sat, 18 Jun 2016 13:15:40 +0000 (15:15 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jun 2016 20:22:41 +0000 (16:22 -0400)
There are two generics functions phy_ethtool_{get|set}_link_ksettings,
so we can use them instead of defining the same code in the driver.

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/allwinner/sun4i-emac.c

index 6e31cb6aa720a53dde883987e26b2c82ddb1be01..6ffdff68bfc477a426acc065db88c38f446b4e21 100644 (file)
@@ -225,31 +225,11 @@ static void emac_get_drvinfo(struct net_device *dev,
        strlcpy(info->bus_info, dev_name(&dev->dev), sizeof(info->bus_info));
 }
 
-static int emac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct phy_device *phydev = dev->phydev;
-
-       if (!phydev)
-               return -ENODEV;
-
-       return phy_ethtool_gset(phydev, cmd);
-}
-
-static int emac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct phy_device *phydev = dev->phydev;
-
-       if (!phydev)
-               return -ENODEV;
-
-       return phy_ethtool_sset(phydev, cmd);
-}
-
 static const struct ethtool_ops emac_ethtool_ops = {
        .get_drvinfo    = emac_get_drvinfo,
-       .get_settings   = emac_get_settings,
-       .set_settings   = emac_set_settings,
        .get_link       = ethtool_op_get_link,
+       .get_link_ksettings = phy_ethtool_get_link_ksettings,
+       .set_link_ksettings = phy_ethtool_set_link_ksettings,
 };
 
 static unsigned int emac_setup(struct net_device *ndev)