[PATCH v2 2/2] mmc: sdhci-of-at91: replace while loop with read_poll_timeout

[Adrian Hunter]

On 24/09/21 11:28 am, Claudiu Beznea wrote:
> Replace while loop with read_poll_timeout().
> 
> Signed-off-by: Claudiu Beznea <claudiu.beznea at microchip.com>

Acked-by: Adrian Hunter <adrian.hunter at intel.com>

> ---
>  drivers/mmc/host/sdhci-of-at91.c | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index 134ba01d3063..d1a1c548c515 100644
> --- 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_detect(struct sdhci_host *host)
>  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_host *host, unsigned int clock)
>  	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;
>