Browse Source

net: ethernet: ax88796: use phy_ethtool_{get|set}_link_ksettings

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>
Philippe Reynes 9 years ago
parent
commit
d21cfb375e
1 changed files with 2 additions and 22 deletions
  1. 2 22
      drivers/net/ethernet/8390/ax88796.c

+ 2 - 22
drivers/net/ethernet/8390/ax88796.c

@@ -470,26 +470,6 @@ static void ax_get_drvinfo(struct net_device *dev,
 	strlcpy(info->bus_info, pdev->name, sizeof(info->bus_info));
 	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)
 static u32 ax_get_msglevel(struct net_device *dev)
 {
 {
 	struct ei_device *ei_local = netdev_priv(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 = {
 static const struct ethtool_ops ax_ethtool_ops = {
 	.get_drvinfo		= ax_get_drvinfo,
 	.get_drvinfo		= ax_get_drvinfo,
-	.get_settings		= ax_get_settings,
-	.set_settings		= ax_set_settings,
 	.get_link		= ethtool_op_get_link,
 	.get_link		= ethtool_op_get_link,
 	.get_ts_info		= ethtool_op_get_ts_info,
 	.get_ts_info		= ethtool_op_get_ts_info,
 	.get_msglevel		= ax_get_msglevel,
 	.get_msglevel		= ax_get_msglevel,
 	.set_msglevel		= ax_set_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
 #ifdef CONFIG_AX88796_93CX6