mmc: sdhci: Get rid of mdelay()s where it is safe and makes sense

Since we don't run in the atomic context any longer, we can
turn mdelay()s into msleep()s.

The only place where the driver is still using mdelay() is
sdhci_send_command(). There it is possible to use sleepable
delays too, but we don't actually want to force rescheduling
in a hot path.

Sure, we might end up calling msleep() there too, just not
via this safe patch.

PAtch based on: http://thread.gmane.org/gmane.linux.kernel.mmc/2579.

Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Jeremie Samuel <jeremie.samuel.ext@parrot.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 774a89c4cc6e2c89e0d4d3a652307077b000bbe5..0602017ac7c4ed7c719925e1a53e8c2cadc2b37b 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -220,7 +220,7 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
                        return;
                }
                timeout--;
-               mdelay(1);
+               msleep(1);
        }
 
        if (host->ops->platform_reset_exit)
@@ -1238,7 +1238,7 @@ clock_set:
                        return;
                }
                timeout--;
-               mdelay(1);
+               msleep(1);
        }
 
        clk |= SDHCI_CLOCK_CARD_EN;
@@ -1317,7 +1317,7 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power)
         * can apply clock after applying power
         */
        if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)
-               mdelay(10);
+               msleep(10);
 
        return power;
 }
@@ -1980,7 +1980,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
                ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
                tuning_loop_counter--;
                timeout--;
-               mdelay(1);
+               msleep(1);
        } while (ctrl & SDHCI_CTRL_EXEC_TUNING);
 
        /*