lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 10/83] mmc: sdhci-of-at91: replace while loop with read_poll_timeout
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    commit 30d4b990ec644e8bd49ef0a2f074fabc0d189e53 upstream.

    Replace while loop with read_poll_timeout().

    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Acked-by: Adrian Hunter <adrian.hunter@intel.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20210924082851.2132068-3-claudiu.beznea@microchip.com
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mmc/host/sdhci-of-at91.c | 16 +++++-----------
    1 file changed, 5 insertions(+), 11 deletions(-)

    --- a/drivers/mmc/host/sdhci-of-at91.c
    +++ b/drivers/mmc/host/sdhci-of-at91.c
    @@ -62,7 +62,6 @@ static void sdhci_at91_set_force_card_de
    static void sdhci_at91_set_clock(struct sdhci_host *host, unsigned int clock)
    {
    u16 clk;
    - unsigned long timeout;

    host->mmc->actual_clock = 0;

    @@ -87,16 +86,11 @@ static void sdhci_at91_set_clock(struct
    sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);

    /* Wait max 20 ms */
    - timeout = 20;
    - while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL))
    - & SDHCI_CLOCK_INT_STABLE)) {
    - if (timeout == 0) {
    - pr_err("%s: Internal clock never stabilised.\n",
    - mmc_hostname(host->mmc));
    - return;
    - }
    - timeout--;
    - mdelay(1);
    + if (read_poll_timeout(sdhci_readw, clk, (clk & SDHCI_CLOCK_INT_STABLE),
    + 1000, 20000, false, host, SDHCI_CLOCK_CONTROL)) {
    + pr_err("%s: Internal clock never stabilised.\n",
    + mmc_hostname(host->mmc));
    + return;
    }

    clk |= SDHCI_CLOCK_CARD_EN;

    \
     
     \ /
      Last update: 2021-10-11 15:52    [W:5.085 / U:0.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site