| From e02729fd0f49ccf4033459ef91f825a23d317920 Mon Sep 17 00:00:00 2001 |
| From: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> |
| Date: Fri, 3 Nov 2017 10:36:28 +0100 |
| Subject: [PATCH 0158/1795] mmc: tmio: Replace msleep() of 20ms or less with |
| usleep_range() |
| |
| As documented in Documentation/timers/timers-howto.txt |
| as follows, replace msleep() with usleep_range(). |
| |
| msleep(1~20) may not do what the caller intends, and |
| will often sleep longer (~20 ms actual sleep for any |
| value given in the 1~20ms range). In many cases this |
| is not the desired behavior. |
| |
| Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 1f27ddf0b50b45eaf0f95565125cf10f9c821746) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mmc/host/tmio_mmc_core.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index 788f11c0ea38..62217afb51d6 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -167,11 +167,11 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host) |
| |
| /* HW engineers overrode docs: no sleep needed on R-Car2+ */ |
| if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2)) |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| |
| if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) { |
| sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0100); |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| } |
| } |
| |
| @@ -179,7 +179,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) |
| { |
| if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) { |
| sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0000); |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| } |
| |
| sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN & |
| @@ -187,7 +187,7 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) |
| |
| /* HW engineers overrode docs: no sleep needed on R-Car2+ */ |
| if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2)) |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| } |
| |
| static void tmio_mmc_set_clock(struct tmio_mmc_host *host, |
| @@ -219,7 +219,7 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, |
| sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL)); |
| sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, clk & CLK_CTL_DIV_MASK); |
| if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2)) |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| |
| tmio_mmc_clk_start(host); |
| } |
| @@ -230,11 +230,11 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) |
| sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); |
| if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) |
| sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); |
| if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) |
| sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); |
| - msleep(10); |
| + usleep_range(10000, 11000); |
| |
| if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { |
| sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); |
| -- |
| 2.19.0 |
| |