Skip to content

Commit

Permalink
net: ethernet: davinci_emac: use phy_ethtool_{get|set}_link_ksettings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philippe Reynes authored and David S. Miller committed Jul 2, 2016
1 parent c332177 commit efb15c3
Showing 1 changed file with 2 additions and 37 deletions.
39 changes: 2 additions & 37 deletions drivers/net/ethernet/ti/davinci_emac.c
Original file line number Diff line number Diff line change
Expand Up @@ -484,41 +484,6 @@ static void emac_get_drvinfo(struct net_device *ndev,
strlcpy(info->version, EMAC_MODULE_VERSION, sizeof(info->version));
}

/**
* emac_get_settings - Get EMAC settings
* @ndev: The DaVinci EMAC network adapter
* @ecmd: ethtool command
*
* Executes ethool get command
*
*/
static int emac_get_settings(struct net_device *ndev,
struct ethtool_cmd *ecmd)
{
if (ndev->phydev)
return phy_ethtool_gset(ndev->phydev, ecmd);
else
return -EOPNOTSUPP;

}

/**
* emac_set_settings - Set EMAC settings
* @ndev: The DaVinci EMAC network adapter
* @ecmd: ethtool command
*
* Executes ethool set command
*
*/
static int emac_set_settings(struct net_device *ndev, struct ethtool_cmd *ecmd)
{
if (ndev->phydev)
return phy_ethtool_sset(ndev->phydev, ecmd);
else
return -EOPNOTSUPP;

}

/**
* emac_get_coalesce - Get interrupt coalesce settings for this device
* @ndev : The DaVinci EMAC network adapter
Expand Down Expand Up @@ -622,12 +587,12 @@ static int emac_set_coalesce(struct net_device *ndev,
*/
static const struct ethtool_ops ethtool_ops = {
.get_drvinfo = emac_get_drvinfo,
.get_settings = emac_get_settings,
.set_settings = emac_set_settings,
.get_link = ethtool_op_get_link,
.get_coalesce = emac_get_coalesce,
.set_coalesce = emac_set_coalesce,
.get_ts_info = ethtool_op_get_ts_info,
.get_link_ksettings = phy_ethtool_get_link_ksettings,
.set_link_ksettings = phy_ethtool_set_link_ksettings,
};

/**
Expand Down

0 comments on commit efb15c3

Please sign in to comment.