diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-02-12 08:40:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-02-12 11:45:59 -0500 |
commit | dd62c236c0fe1166d037485494ec5ff6545480eb (patch) | |
tree | 1ba1361cd6f10b2613f467cc883c5c2766a0b6b6 | |
parent | 18a5b052bb1ae77453c5e50fffe3470ced9ed82f (diff) |
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 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>
-rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index c87f57ca4437..a95fbd5510d9 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c | |||
@@ -2255,9 +2255,6 @@ static int ravb_wol_setup(struct net_device *ndev) | |||
2255 | /* Enable MagicPacket */ | 2255 | /* Enable MagicPacket */ |
2256 | ravb_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE); | 2256 | ravb_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE); |
2257 | 2257 | ||
2258 | /* Increased clock usage so device won't be suspended */ | ||
2259 | clk_enable(priv->clk); | ||
2260 | |||
2261 | return enable_irq_wake(priv->emac_irq); | 2258 | return enable_irq_wake(priv->emac_irq); |
2262 | } | 2259 | } |
2263 | 2260 | ||
@@ -2276,9 +2273,6 @@ static int ravb_wol_restore(struct net_device *ndev) | |||
2276 | if (ret < 0) | 2273 | if (ret < 0) |
2277 | return ret; | 2274 | return ret; |
2278 | 2275 | ||
2279 | /* Restore clock usage count */ | ||
2280 | clk_disable(priv->clk); | ||
2281 | |||
2282 | return disable_irq_wake(priv->emac_irq); | 2276 | return disable_irq_wake(priv->emac_irq); |
2283 | } | 2277 | } |
2284 | 2278 | ||