| From 9764852a7726eeb0027a48fecffa2bcb63c35452 Mon Sep 17 00:00:00 2001 |
| From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> |
| Date: Wed, 4 Jul 2018 11:16:11 +0300 |
| Subject: [PATCH 1572/1795] ravb: remove custom .get_link_ksettings from |
| ethtool ops |
| |
| The generic phy_ethtool_get_link_ksettings() function from phylib can be |
| used instead of in-house ravb_get_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 468e40b5fe4fe18e8468dfd03ba4457a9102d066) |
| 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 | 13 +------------ |
| 1 file changed, 1 insertion(+), 12 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c |
| index 772687a5faee..9fe01259be6f 100644 |
| --- a/drivers/net/ethernet/renesas/ravb_main.c |
| +++ b/drivers/net/ethernet/renesas/ravb_main.c |
| @@ -1106,17 +1106,6 @@ static int ravb_phy_start(struct net_device *ndev) |
| return 0; |
| } |
| |
| -static int ravb_get_link_ksettings(struct net_device *ndev, |
| - struct ethtool_link_ksettings *cmd) |
| -{ |
| - if (!ndev->phydev) |
| - return -ENODEV; |
| - |
| - phy_ethtool_ksettings_get(ndev->phydev, cmd); |
| - |
| - return 0; |
| -} |
| - |
| static int ravb_set_link_ksettings(struct net_device *ndev, |
| const struct ethtool_link_ksettings *cmd) |
| { |
| @@ -1348,7 +1337,7 @@ static const struct ethtool_ops ravb_ethtool_ops = { |
| .get_ringparam = ravb_get_ringparam, |
| .set_ringparam = ravb_set_ringparam, |
| .get_ts_info = ravb_get_ts_info, |
| - .get_link_ksettings = ravb_get_link_ksettings, |
| + .get_link_ksettings = phy_ethtool_get_link_ksettings, |
| .set_link_ksettings = ravb_set_link_ksettings, |
| .get_wol = ravb_get_wol, |
| .set_wol = ravb_set_wol, |
| -- |
| 2.19.0 |
| |