Revert "net: mvneta: speed down the PHY, if WoL used, to save energy" (59353266) · Commits · 戴 / test

drivers/net/ethernet/marvell/mvneta.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -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;
		}