| From bb222cc5d313a69bb037b8a0368f738e60fe4a0c Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 12 Feb 2018 14:40:00 +0100 |
| Subject: [PATCH 0434/1795] ravb: Remove obsolete explicit clock handling for |
| WoL |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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 91c719f5ec6671f7 ("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> |
| (cherry picked from commit dd62c236c0fe1166d037485494ec5ff6545480eb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/ethernet/renesas/ravb_main.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c |
| index 1cc2c266fe9f..e38d25d981e3 100644 |
| --- a/drivers/net/ethernet/renesas/ravb_main.c |
| +++ b/drivers/net/ethernet/renesas/ravb_main.c |
| @@ -2231,9 +2231,6 @@ static int ravb_wol_setup(struct net_device *ndev) |
| /* Enable MagicPacket */ |
| 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); |
| } |
| |
| @@ -2252,9 +2249,6 @@ static int ravb_wol_restore(struct net_device *ndev) |
| if (ret < 0) |
| return ret; |
| |
| - /* Restore clock usage count */ |
| - clk_disable(priv->clk); |
| - |
| return disable_irq_wake(priv->emac_irq); |
| } |
| |
| -- |
| 2.19.0 |
| |