[MMC] Allow detection/removal to be delayed

Change mmc_detect_change() to take a delay argument such that
the detection of card insertions and removals can be delayed
according to the requirements of the host driver or platform.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 12 insertions, 8 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 0a117c61cd1..ceae379a4d4 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1079,13 +1079,17 @@ static void mmc_setup(struct mmc_host *host)
 /**
  *      mmc_detect_change - process change of state on a MMC socket
  *      @host: host which changed state.
+ *      @delay: optional delay to wait before detection (jiffies)
  *
  *      All we know is that card(s) have been inserted or removed
  *      from the socket(s).  We don't know which socket or cards.
  */
-void mmc_detect_change(struct mmc_host *host)
+void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
-        schedule_work(&host->detect);
+        if (delay)
+                schedule_delayed_work(&host->detect, delay);
+        else
+                schedule_work(&host->detect);
 }
 
 EXPORT_SYMBOL(mmc_detect_change);
@@ -1189,7 +1193,7 @@ int mmc_add_host(struct mmc_host *host)
         ret = mmc_add_host_sysfs(host);
         if (ret == 0) {
                 mmc_power_off(host);
-                mmc_detect_change(host);
+                mmc_detect_change(host, 0);
         }
 
         return ret;
@@ -1259,7 +1263,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-        mmc_detect_change(host);
+        mmc_detect_change(host, 0);
 
         return 0;
 }
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 716c4ef4faf..91c74843dc0 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -442,7 +442,7 @@ static void mmci_check_status(unsigned long data)
 
         status = host->plat->status(mmc_dev(host->mmc));
         if (status ^ host->oldstat)
-                mmc_detect_change(host->mmc);
+                mmc_detect_change(host->mmc, 0);
 
         host->oldstat = status;
         mod_timer(&host->timer, jiffies + HZ);
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index e99a53b09e3..5223cd3bfc1 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -423,7 +423,7 @@ static void pxamci_dma_irq(int dma, void *devid, struct pt_regs *regs)
 
 static irqreturn_t pxamci_detect_irq(int irq, void *devid, struct pt_regs *regs)
 {
-        mmc_detect_change(devid);
+        mmc_detect_change(devid, 0);
         return IRQ_HANDLED;
 }
 
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index dec01d38c78..a62c86fef5c 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1122,7 +1122,7 @@ static void wbsd_detect_card(unsigned long data)
         
         DBG("Executing card detection\n");
         
-        mmc_detect_change(host->mmc);   
+        mmc_detect_change(host->mmc, 0);        
 }
 
 /*
@@ -1198,7 +1198,7 @@ static void wbsd_tasklet_card(unsigned long param)
                  */
                 spin_unlock(&host->lock);
 
-                mmc_detect_change(host->mmc);
+                mmc_detect_change(host->mmc, 0);
         }
         else
                 spin_unlock(&host->lock);