]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net: ethernet: ax88796: use phy_ethtool_{get|set}_link_ksettings
authorPhilippe Reynes <tremyfr@gmail.com>
Wed, 15 Jun 2016 22:12:49 +0000 (00:12 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jun 2016 00:07:05 +0000 (17:07 -0700)
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/8390/ax88796.c

index b44697765384e5e406e230c24f4934b1f2acfe70..5698f5354c0bbd5b27061635757c894d315f8a65 100644 (file)
@@ -470,26 +470,6 @@ static void ax_get_drvinfo(struct net_device *dev,
        strlcpy(info->bus_info, pdev->name, sizeof(info->bus_info));
 }
 
-static int ax_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct phy_device *phy_dev = dev->phydev;
-
-       if (!phy_dev)
-               return -ENODEV;
-
-       return phy_ethtool_gset(phy_dev, cmd);
-}
-
-static int ax_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
-       struct phy_device *phy_dev = dev->phydev;
-
-       if (!phy_dev)
-               return -ENODEV;
-
-       return phy_ethtool_sset(phy_dev, cmd);
-}
-
 static u32 ax_get_msglevel(struct net_device *dev)
 {
        struct ei_device *ei_local = netdev_priv(dev);
@@ -506,12 +486,12 @@ static void ax_set_msglevel(struct net_device *dev, u32 v)
 
 static const struct ethtool_ops ax_ethtool_ops = {
        .get_drvinfo            = ax_get_drvinfo,
-       .get_settings           = ax_get_settings,
-       .set_settings           = ax_set_settings,
        .get_link               = ethtool_op_get_link,
        .get_ts_info            = ethtool_op_get_ts_info,
        .get_msglevel           = ax_get_msglevel,
        .set_msglevel           = ax_set_msglevel,
+       .get_link_ksettings     = phy_ethtool_get_link_ksettings,
+       .set_link_ksettings     = phy_ethtool_set_link_ksettings,
 };
 
 #ifdef CONFIG_AX88796_93CX6