| From 95c76a983d080d4a0bd1e18f98fbaaf9692e0746 Mon Sep 17 00:00:00 2001 |
| From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> |
| Date: Wed, 4 Jul 2018 11:16:09 +0300 |
| Subject: [PATCH 1570/1795] ravb: remove custom .nway_reset from ethtool ops |
| |
| The generic phy_ethtool_nway_reset() function from phylib can be used |
| instead of in-house ravb_nway_reset(). |
| |
| Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> |
| Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit eeb07284717be2950c3b501df2debc0373eae19a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/ethernet/renesas/ravb_main.c | 12 +----------- |
| 1 file changed, 1 insertion(+), 11 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c |
| index 31913a469001..6002132093cd 100644 |
| --- a/drivers/net/ethernet/renesas/ravb_main.c |
| +++ b/drivers/net/ethernet/renesas/ravb_main.c |
| @@ -1131,16 +1131,6 @@ static int ravb_set_link_ksettings(struct net_device *ndev, |
| return phy_ethtool_ksettings_set(ndev->phydev, cmd); |
| } |
| |
| -static int ravb_nway_reset(struct net_device *ndev) |
| -{ |
| - int error = -ENODEV; |
| - |
| - if (ndev->phydev) |
| - error = phy_restart_aneg(ndev->phydev); |
| - |
| - return error; |
| -} |
| - |
| static u32 ravb_get_msglevel(struct net_device *ndev) |
| { |
| struct ravb_private *priv = netdev_priv(ndev); |
| @@ -1353,7 +1343,7 @@ static int ravb_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) |
| } |
| |
| static const struct ethtool_ops ravb_ethtool_ops = { |
| - .nway_reset = ravb_nway_reset, |
| + .nway_reset = phy_ethtool_nway_reset, |
| .get_msglevel = ravb_get_msglevel, |
| .set_msglevel = ravb_set_msglevel, |
| .get_link = ethtool_op_get_link, |
| -- |
| 2.19.0 |
| |