Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82526e15 authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by Amit Pundir
Browse files

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

Patch mmc: core: Signal wakeup event at card insert/removal
provides wake lock for mmc_detect_change()

This reverts commit c4cda98f.
parent 668cdada

drivers/mmc/core/core.c

+1 −16
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/random.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/wakelock.h>



#include <trace/events/mmc.h>
@@ -58,7 +57,6 @@ 
#define MMC_BKOPS_MAX_TIMEOUT	(4 * 60 * 1000) /* max time to wait in ms */



static struct workqueue_struct *workqueue;

static struct wake_lock mmc_delayed_work_wake_lock;

static const unsigned freqs[] = { 400000, 300000, 200000, 100000 };



/*
@@ -75,7 +73,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);

}
@@ -2454,7 +2451,6 @@ void mmc_rescan(struct work_struct *work) 
	struct mmc_host *host =

		container_of(work, struct mmc_host, detect.work);

	int i;

	bool extend_wakelock = false;



	if (host->trigger_card_event && host->ops->card_event) {

		host->ops->card_event(host);
@@ -2510,20 +2506,14 @@ void mmc_rescan(struct work_struct *work) 


	mmc_claim_host(host);

	for (i = 0; i < ARRAY_SIZE(freqs); i++) {

		if (!mmc_rescan_try_freq(host, max(freqs[i], host->f_min))) {

			extend_wakelock = true;

		if (!mmc_rescan_try_freq(host, max(freqs[i], host->f_min)))

			break;

		}

		if (freqs[i] <= host->f_min)

			break;

	}

	mmc_release_host(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);

}
@@ -2745,9 +2735,6 @@ static int __init mmc_init(void) 
	if (!workqueue)

		return -ENOMEM;



	wake_lock_init(&mmc_delayed_work_wake_lock, WAKE_LOCK_SUSPEND,

		       "mmc_delayed_work");



	ret = mmc_register_bus();

	if (ret)

		goto destroy_workqueue;
@@ -2768,7 +2755,6 @@ unregister_bus: 
	mmc_unregister_bus();

destroy_workqueue:

	destroy_workqueue(workqueue);

	wake_lock_destroy(&mmc_delayed_work_wake_lock);



	return ret;

}
@@ -2779,7 +2765,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);