[PATCH 3/3 v2] mmc: Use mmc_delay() instead of mdelay() for time delay

The mmc_delay() is a wrapper function for mdelay() and msleep().

    o mdelay() -- block the system when busy-waiting.
    o msleep() -- suspend the currently running task to enable CPU
                  to process other tasks, so it is non-blocking
                  regarding the whole system.

When the desired delay time is more than a period of timer interrupt,
just use msleep(). Change mdelay() to mmc_delay() to avoid chewing
CPU when busy wait.

Signed-off-by: Shengzhou Liu <redacted>
Signed-off-by: Chunhe Lan <redacted>
Cc: Chris Ball <redacted>
---
 drivers/mmc/host/sdhci.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0e02cc1..b0cf79f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c

@@ -186,7 +186,7 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)
 			return;
 		}
 		timeout--;
-		mdelay(1);
+		mmc_delay(1);
 	}
 
 	if (host->ops->platform_reset_exit)

@@ -957,7 +957,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
 			return;
 		}
 		timeout--;
-		mdelay(1);
+		mmc_delay(1);
 	}
 
 	mod_timer(&host->timer, jiffies + 10 * HZ);

@@ -1127,7 +1127,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
 			return;
 		}
 		timeout--;
-		mdelay(1);
+		mmc_delay(1);
 	}
 
 	clk |= SDHCI_CLOCK_CARD_EN;

@@ -1192,7 +1192,7 @@ static void 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);
+		mmc_delay(10);
 }
 
 /*****************************************************************************\

@@ -1712,7 +1712,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc)
 		ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 		tuning_loop_counter--;
 		timeout--;
-		mdelay(1);
+		mmc_delay(1);
 	} while (ctrl & SDHCI_CTRL_EXEC_TUNING);
 
 	/*

-- 
1.7.5.1

On Aug 26, 2011, at 2:55 AM, Chunhe Lan wrote:

The mmc_delay() is a wrapper function for mdelay() and msleep().
=20
   o mdelay() -- block the system when busy-waiting.
   o msleep() -- suspend the currently running task to enable CPU
                 to process other tasks, so it is non-blocking
                 regarding the whole system.
=20
When the desired delay time is more than a period of timer interrupt,
just use msleep(). Change mdelay() to mmc_delay() to avoid chewing
CPU when busy wait.
=20
Signed-off-by: Shengzhou Liu <redacted>
Signed-off-by: Chunhe Lan <redacted>
Cc: Chris Ball <redacted>
---
drivers/mmc/host/sdhci.c |   10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

It might be good to either merge patch 2/3 & 3/3 or rename them since =
they have same commit message.

Chris,

Any comments on closing on these patches?

- k=

On Thu, 01 Sep 2011 12:42:08 +0800, Kumar Gala [off-list ref]  
wrote:

On Aug 26, 2011, at 2:55 AM, Chunhe Lan wrote:

quoted

The mmc_delay() is a wrapper function for mdelay() and msleep().

   o mdelay() -- block the system when busy-waiting.
   o msleep() -- suspend the currently running task to enable CPU
                 to process other tasks, so it is non-blocking
                 regarding the whole system.

When the desired delay time is more than a period of timer interrupt,
just use msleep(). Change mdelay() to mmc_delay() to avoid chewing
CPU when busy wait.

Signed-off-by: Shengzhou Liu <redacted>
Signed-off-by: Chunhe Lan <redacted>
Cc: Chris Ball <redacted>
---
drivers/mmc/host/sdhci.c |   10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

It might be good to either merge patch 2/3 & 3/3 or rename them since  
they have same commit message.

Chris,

Any comments on closing on these patches?

   Hello Chris,

           Do you any comments on these patches ?
           If not, can you apply these patches to mmc-next ?

           Thanks.
          -Jack

- k