* [PATCH 10/15] net: fs_enet: Utilize phy_ethtool_nway_reset
[not found] <20161115180644.3941-1-f.fainelli@gmail.com>
@ 2016-11-15 18:06 ` Florian Fainelli
2016-11-15 18:06 ` [PATCH 12/15] net: ethernet: ucc: " Florian Fainelli
1 sibling, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2016-11-15 18:06 UTC (permalink / raw)
To: netdev
Cc: davem, andrew, tremyfr, Florian Fainelli, Pantelis Antoniou,
Vitaly Bordug, open list:FREESCALE SOC FS_ENET DRIVER, open list
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 44f50e168703..34843c155420 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -807,11 +807,6 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs,
regs->version = 0;
}
-static int fs_nway_reset(struct net_device *dev)
-{
- return 0;
-}
-
static u32 fs_get_msglevel(struct net_device *dev)
{
struct fs_enet_private *fep = netdev_priv(dev);
@@ -865,7 +860,7 @@ static int fs_set_tunable(struct net_device *dev,
static const struct ethtool_ops fs_ethtool_ops = {
.get_drvinfo = fs_get_drvinfo,
.get_regs_len = fs_get_regs_len,
- .nway_reset = fs_nway_reset,
+ .nway_reset = phy_ethtool_nway_reset,
.get_link = ethtool_op_get_link,
.get_msglevel = fs_get_msglevel,
.set_msglevel = fs_set_msglevel,
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 12/15] net: ethernet: ucc: Utilize phy_ethtool_nway_reset
[not found] <20161115180644.3941-1-f.fainelli@gmail.com>
2016-11-15 18:06 ` [PATCH 10/15] net: fs_enet: Utilize phy_ethtool_nway_reset Florian Fainelli
@ 2016-11-15 18:06 ` Florian Fainelli
1 sibling, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2016-11-15 18:06 UTC (permalink / raw)
To: netdev
Cc: davem, andrew, tremyfr, Florian Fainelli, Li Yang,
open list:FREESCALE QUICC ENGINE UCC ETHERNET DRIVER, open list
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
index 812a968a78e9..8ba636f61b50 100644
--- a/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
+++ b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
@@ -332,13 +332,6 @@ static void uec_get_ethtool_stats(struct net_device *netdev,
}
}
-static int uec_nway_reset(struct net_device *netdev)
-{
- struct ucc_geth_private *ugeth = netdev_priv(netdev);
-
- return phy_start_aneg(ugeth->phydev);
-}
-
/* Report driver information */
static void
uec_get_drvinfo(struct net_device *netdev,
@@ -394,7 +387,7 @@ static const struct ethtool_ops uec_ethtool_ops = {
.get_regs = uec_get_regs,
.get_msglevel = uec_get_msglevel,
.set_msglevel = uec_set_msglevel,
- .nway_reset = uec_nway_reset,
+ .nway_reset = phy_ethtool_nway_reset,
.get_link = ethtool_op_get_link,
.get_ringparam = uec_get_ringparam,
.set_ringparam = uec_set_ringparam,
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread