Commit dd62c236 authored Feb 12, 2018 by Geert Uytterhoeven Committed by David S. Miller Feb 12, 2018

ravb: Remove obsolete explicit clock handling for WoL



Currently, if Wake-on-LAN is enabled, the EtherAVB device's module clock
is manually kept running during system suspend, to make sure the device
stays active.

Since commit 91c719f5 ("soc: renesas: rcar-sysc: Keep wakeup
sources active during system suspend") , this workaround is no longer
needed.  Hence remove all explicit clock handling to keep the device
active.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 18a5b052

drivers/net/ethernet/renesas/ravb_main.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2255,9 +2255,6 @@ static int ravb_wol_setup(struct net_device *ndev)
	/* Enable MagicPacket */		/* Enable MagicPacket */
	ravb_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE);		ravb_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE);

	/* Increased clock usage so device won't be suspended */
	clk_enable(priv->clk);

	return enable_irq_wake(priv->emac_irq);		return enable_irq_wake(priv->emac_irq);
	}		}

	@@ -2276,9 +2273,6 @@ static int ravb_wol_restore(struct net_device *ndev)
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;

	/* Restore clock usage count */
	clk_disable(priv->clk);

	return disable_irq_wake(priv->emac_irq);		return disable_irq_wake(priv->emac_irq);
	}		}