1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 9d190022a490..6f2a282e2b97 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1419,18 +1419,16 @@ static void mmc_setup(struct mmc_host *host)
  */
 void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
-        if (delay)
-                mmc_schedule_delayed_work(&host->detect, delay);
-        else
-                mmc_schedule_work(&host->detect);
+        mmc_schedule_delayed_work(&host->detect, delay);
 }
 
 EXPORT_SYMBOL(mmc_detect_change);
 
 
-static void mmc_rescan(void *data)
+static void mmc_rescan(struct work_struct *work)
 {
-        struct mmc_host *host = data;
+        struct mmc_host *host =
+                container_of(work, struct mmc_host, detect.work);
         struct list_head *l, *n;
         unsigned char power_mode;
 
@@ -1513,7 +1511,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
                 spin_lock_init(&host->lock);
                 init_waitqueue_head(&host->wq);
                 INIT_LIST_HEAD(&host->cards);
-                INIT_WORK(&host->detect, mmc_rescan, host);
+                INIT_DELAYED_WORK(&host->detect, mmc_rescan);
 
                 /*
                  * By default, hosts do not support SGIO or large requests.
@@ -1611,7 +1609,7 @@ EXPORT_SYMBOL(mmc_suspend_host);
  */
 int mmc_resume_host(struct mmc_host *host)
 {
-        mmc_rescan(host);
+        mmc_rescan(&host->detect.work);
 
         return 0;
 }