Revert "net: mvneta: speed down the PHY, if WoL used, to save energy"

This reverts commit 5e3768a436bb70c9c3e27aaba6b73f8ef8f5dcf3.

On request from Russell King, this is a layering violation.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 41d2a0e..3794794 100644 (file)
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3566,10 +3566,6 @@ static void mvneta_start_dev(struct mvneta_port *pp)
                    MVNETA_CAUSE_LINK_CHANGE);
 
        phylink_start(pp->phylink);
-
-       /* We may have called phy_speed_down before */
-       phy_speed_up(pp->dev->phydev);
-
        netif_tx_start_all_queues(pp->dev);
 }
 
@@ -3577,9 +3573,6 @@ static void mvneta_stop_dev(struct mvneta_port *pp)
 {
        unsigned int cpu;
 
-       if (device_may_wakeup(&pp->dev->dev))
-               phy_speed_down(pp->dev->phydev, false);
-
        phylink_stop(pp->phylink);
 
        if (!pp->neta_armada3700) {
@@ -4052,10 +4045,6 @@ static int mvneta_mdio_probe(struct mvneta_port *pp)
        phylink_ethtool_get_wol(pp->phylink, &wol);
        device_set_wakeup_capable(&pp->dev->dev, !!wol.supported);
 
-       /* PHY WoL may be enabled but device wakeup disabled */
-       if (wol.supported)
-               device_set_wakeup_enable(&pp->dev->dev, !!wol.wolopts);
-
        return err;
 }