Since recent commit("mmc: core: Use delayed work in clock gating
framework":597dd9d79cfbbb1), we always wait "unnecessary" default
clock delay(8 cycles). Actually, we don't need it if clkgate_delay
(unit:ms) is set because we already wait sufficient time to change
the clock due to delayed_workqueue.
This patch removes duplicated waiting time when clkgate_delay is set.Signed-off-by: Chanho Park <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> --- drivers/mmc/core/host.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index c3704e2..d710ce0 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -109,8 +109,11 @@ static void mmc_host_clk_gate_delayed(struct mmc_host *host) */ if (!host->clk_requests) { spin_unlock_irqrestore(&host->clk_lock, flags); - tick_ns = DIV_ROUND_UP(1000000000, freq); - ndelay(host->clk_delay * tick_ns); + /* wait only when clk_gate_delay is 0*/ + if (!host->clkgate_delay) { + tick_ns = DIV_ROUND_UP(1000000000, freq); + ndelay(host->clk_delay * tick_ns); + } } else { /* New users appeared while waiting for this work */ spin_unlock_irqrestore(&host->clk_lock, flags); -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
