Skip to content

Commit

Permalink
net: ethernet: fec_mpc52xx: move to new ethtool api {get|set}_link_ks…
Browse files Browse the repository at this point in the history
…ettings

The ethtool api {get|set}_settings is deprecated.
We move the fec_mpc52xx driver to new api {get|set}_link_ksettings.

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 May 3, 2016
1 parent a10cdae commit e03179f
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions drivers/net/ethernet/freescale/fec_mpc52xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,24 +763,28 @@ static void mpc52xx_fec_reset(struct net_device *dev)

/* ethtool interface */

static int mpc52xx_fec_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static int mpc52xx_fec_get_ksettings(struct net_device *dev,
struct ethtool_link_ksettings *cmd)
{
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phydev;

if (!priv->phydev)
return -ENODEV;

return phy_ethtool_gset(priv->phydev, cmd);
return phy_ethtool_ksettings_get(phydev, cmd);
}

static int mpc52xx_fec_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static int mpc52xx_fec_set_ksettings(struct net_device *dev,
const struct ethtool_link_ksettings *cmd)
{
struct mpc52xx_fec_priv *priv = netdev_priv(dev);
struct phy_device *phydev = priv->phydev;

if (!priv->phydev)
return -ENODEV;

return phy_ethtool_sset(priv->phydev, cmd);
return phy_ethtool_ksettings_set(phydev, cmd);
}

static u32 mpc52xx_fec_get_msglevel(struct net_device *dev)
Expand All @@ -796,12 +800,12 @@ static void mpc52xx_fec_set_msglevel(struct net_device *dev, u32 level)
}

static const struct ethtool_ops mpc52xx_fec_ethtool_ops = {
.get_settings = mpc52xx_fec_get_settings,
.set_settings = mpc52xx_fec_set_settings,
.get_link = ethtool_op_get_link,
.get_msglevel = mpc52xx_fec_get_msglevel,
.set_msglevel = mpc52xx_fec_set_msglevel,
.get_ts_info = ethtool_op_get_ts_info,
.get_link_ksettings = mpc52xx_fec_get_ksettings,
.set_link_ksettings = mpc52xx_fec_set_ksettings,
};


Expand Down

0 comments on commit e03179f

Please sign in to comment.