Skip to content

Commit

Permalink
Revert "net: mvneta: speed down the PHY, if WoL used, to save energy"
Browse files Browse the repository at this point in the history
This reverts commit 5e3768a.

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

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 22, 2020
1 parent 93a09e7 commit 5935326
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions drivers/net/ethernet/marvell/mvneta.c
Original file line number Diff line number Diff line change
Expand Up @@ -3566,20 +3566,13 @@ 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);
}

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) {
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 5935326

Please sign in to comment.