Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan"

This reverts commit 126f493e6b281b802471ce475c83c5a6ae58e26d.

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 08d08e4699e7380524f5001834d965f2f0d0297d..e543f85deb79a773ec4900f9132c79f72c828adc 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -22,7 +22,6 @@
 #include <linux/scatterlist.h>
 #include <linux/log2.h>
 #include <linux/regulator/consumer.h>
-#include <linux/wakelock.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
@@ -39,7 +38,6 @@
 #include "sdio_ops.h"
 
 static struct workqueue_struct *workqueue;
-static struct wake_lock mmc_delayed_work_wake_lock;
 
 /*
  * Enabling software CRCs on the data blocks can be a significant (30%)
@@ -55,7 +53,6 @@ module_param(use_spi_crc, bool, 0);
 static int mmc_schedule_delayed_work(struct delayed_work *work,
                                     unsigned long delay)
 {
-       wake_lock(&mmc_delayed_work_wake_lock);
        return queue_delayed_work(workqueue, work, delay);
 }
 
@@ -1044,7 +1041,6 @@ void mmc_rescan(struct work_struct *work)
                container_of(work, struct mmc_host, detect.work);
        u32 ocr;
        int err;
-       int extend_wakelock = 0;
 
        mmc_bus_get(host);
 
@@ -1088,7 +1084,6 @@ void mmc_rescan(struct work_struct *work)
        if (!err) {
                if (mmc_attach_sdio(host, ocr))
                        mmc_power_off(host);
-               extend_wakelock = 1;
                goto out;
        }
 
@@ -1099,7 +1094,6 @@ void mmc_rescan(struct work_struct *work)
        if (!err) {
                if (mmc_attach_sd(host, ocr))
                        mmc_power_off(host);
-               extend_wakelock = 1;
                goto out;
        }
 
@@ -1110,7 +1104,6 @@ void mmc_rescan(struct work_struct *work)
        if (!err) {
                if (mmc_attach_mmc(host, ocr))
                        mmc_power_off(host);
-               extend_wakelock = 1;
                goto out;
        }
 
@@ -1118,11 +1111,6 @@ void mmc_rescan(struct work_struct *work)
        mmc_power_off(host);
 
 out:
-       if (extend_wakelock)
-               wake_lock_timeout(&mmc_delayed_work_wake_lock, HZ / 2);
-       else
-               wake_unlock(&mmc_delayed_work_wake_lock);
-
        if (host->caps & MMC_CAP_NEEDS_POLL)
                mmc_schedule_delayed_work(&host->detect, HZ);
 }
@@ -1344,8 +1332,6 @@ static int __init mmc_init(void)
 {
        int ret;
 
-       wake_lock_init(&mmc_delayed_work_wake_lock, WAKE_LOCK_SUSPEND, "mmc_delayed_work");
-
        workqueue = create_singlethread_workqueue("kmmcd");
        if (!workqueue)
                return -ENOMEM;
@@ -1380,7 +1366,6 @@ static void __exit mmc_exit(void)
        mmc_unregister_host_class();
        mmc_unregister_bus();
        destroy_workqueue(workqueue);
-       wake_lock_destroy(&mmc_delayed_work_wake_lock);
 }
 
 subsys_initcall(mmc_init);