diff options
| author | Philippe Reynes <tremyfr@gmail.com> | 2016-06-25 22:05:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-28 09:12:35 -0400 |
| commit | 2ebc440a1f2be7c572c8ea174d1b2a6a0d4e41a3 (patch) | |
| tree | cb2da7ea3d872db9a6108c5eb0ac72f19deeae57 /drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | |
| parent | cffce3615dd582ac30a2a0d81d9a46aaa8f4e0bb (diff) | |
| download | talos-obmc-linux-2ebc440a1f2be7c572c8ea174d1b2a6a0d4e41a3.tar.gz talos-obmc-linux-2ebc440a1f2be7c572c8ea174d1b2a6a0d4e41a3.zip | |
net: ethernet: sxgbe: use phydev from struct net_device
The private structure contain a pointer to phydev, but the structure
net_device already contain such pointer. So we can remove the pointer
phydev in the private structure, and update the driver to use the
one contained in struct net_device.
Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c index c0981ae45874..72c910832bbb 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c @@ -147,7 +147,7 @@ static int sxgbe_get_eee(struct net_device *dev, edata->eee_active = priv->eee_active; edata->tx_lpi_timer = priv->tx_lpi_timer; - return phy_ethtool_get_eee(priv->phydev, edata); + return phy_ethtool_get_eee(dev->phydev, edata); } static int sxgbe_set_eee(struct net_device *dev, @@ -172,7 +172,7 @@ static int sxgbe_set_eee(struct net_device *dev, priv->tx_lpi_timer = edata->tx_lpi_timer; } - return phy_ethtool_set_eee(priv->phydev, edata); + return phy_ethtool_set_eee(dev->phydev, edata); } static void sxgbe_getdrvinfo(struct net_device *dev, @@ -185,20 +185,16 @@ static void sxgbe_getdrvinfo(struct net_device *dev, static int sxgbe_getsettings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct sxgbe_priv_data *priv = netdev_priv(dev); - - if (priv->phydev) - return phy_ethtool_gset(priv->phydev, cmd); + if (dev->phydev) + return phy_ethtool_gset(dev->phydev, cmd); return -EOPNOTSUPP; } static int sxgbe_setsettings(struct net_device *dev, struct ethtool_cmd *cmd) { - struct sxgbe_priv_data *priv = netdev_priv(dev); - - if (priv->phydev) - return phy_ethtool_sset(priv->phydev, cmd); + if (dev->phydev) + return phy_ethtool_sset(dev->phydev, cmd); return -EOPNOTSUPP; } @@ -255,7 +251,7 @@ static void sxgbe_get_ethtool_stats(struct net_device *dev, char *p; if (priv->eee_enabled) { - int val = phy_get_eee_err(priv->phydev); + int val = phy_get_eee_err(dev->phydev); if (val) priv->xstats.eee_wakeup_error_n = val; |
