| From fca4b0160703f9c6132525dbb7c82b3049004ebe Mon Sep 17 00:00:00 2001 |
| From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> |
| Date: Wed, 4 Jul 2018 11:16:12 +0300 |
| Subject: [PATCH 1573/1795] ravb: remove custom .set_link_ksettings from |
| ethtool ops |
| |
| The generic phy_ethtool_set_link_ksettings() function from phylib can |
| be used instead of in-house ravb_set_link_ksettings(). |
| |
| 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 44f3d5581ebbdff59311d45cf862d2e040aeefeb) |
| 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 | 11 +---------- |
| 1 file changed, 1 insertion(+), 10 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c |
| index 9fe01259be6f..0d811c02ff34 100644 |
| --- a/drivers/net/ethernet/renesas/ravb_main.c |
| +++ b/drivers/net/ethernet/renesas/ravb_main.c |
| @@ -1106,15 +1106,6 @@ static int ravb_phy_start(struct net_device *ndev) |
| return 0; |
| } |
| |
| -static int ravb_set_link_ksettings(struct net_device *ndev, |
| - const struct ethtool_link_ksettings *cmd) |
| -{ |
| - if (!ndev->phydev) |
| - return -ENODEV; |
| - |
| - return phy_ethtool_ksettings_set(ndev->phydev, cmd); |
| -} |
| - |
| static u32 ravb_get_msglevel(struct net_device *ndev) |
| { |
| struct ravb_private *priv = netdev_priv(ndev); |
| @@ -1338,7 +1329,7 @@ static const struct ethtool_ops ravb_ethtool_ops = { |
| .set_ringparam = ravb_set_ringparam, |
| .get_ts_info = ravb_get_ts_info, |
| .get_link_ksettings = phy_ethtool_get_link_ksettings, |
| - .set_link_ksettings = ravb_set_link_ksettings, |
| + .set_link_ksettings = phy_ethtool_set_link_ksettings, |
| .get_wol = ravb_get_wol, |
| .set_wol = ravb_set_wol, |
| }; |
| -- |
| 2.19.0 |
| |
