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

Commit 9e1d7cd6 authored by John Stultz's avatar John Stultz Committed by Amit Pundir
Browse files

Revert "mmc: mmcblk: Add support for deferred SD bus resume" 



This reverts commit bc4dc52f178828e0000ce857f9a97fd8912c8e85.

Adds which hasn't built for awhile, so remove it.

Change-Id: Ife20b1b155ffe9afb3f0c5223727f7b8bd799d15
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
(cherry picked from commit fe20b1b155ffe9afb3f0c5223727f7b8bd799d15)
parent 4188e809

drivers/mmc/card/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -50,15 +50,6 @@ config MMC_BLOCK_BOUNCE 


	  If unsure, say Y here.



config MMC_BLOCK_DEFERRED_RESUME

	bool "Deferr MMC layer resume until I/O is requested"

	depends on MMC_BLOCK

	default n

	help

	  Say Y here to enable deferred MMC resume until I/O

	  is requested. This will reduce overall resume latency and

	  save power when theres an SD card inserted but not being used.



config SDIO_UART

	tristate "SDIO UART/GPS class support"

	depends on TTY

drivers/mmc/card/block.c

+0 −16
Original line number Diff line number Diff line
@@ -2027,9 +2027,6 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
	return 0;

}



static int

mmc_blk_set_blksize(struct mmc_blk_data *md, struct mmc_card *card);



static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)

{

	int ret;
@@ -2039,13 +2036,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
	unsigned long flags;

	unsigned int cmd_flags = req ? req->cmd_flags : 0;



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	if (mmc_bus_needs_resume(card->host)) {

		mmc_resume_bus(card->host);

		mmc_blk_set_blksize(md, card);

	}

#endif



	if (req && !mq->mqrq_prev->req)

		/* claim host only for the first request */

		mmc_get_card(card);
@@ -2485,9 +2475,6 @@ static int mmc_blk_probe(struct mmc_card *card) 


	mmc_set_drvdata(card, md);



#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	mmc_set_bus_resume_policy(card->host, 1);

#endif

	if (mmc_add_disk(md))

		goto out;
@@ -2530,9 +2517,6 @@ static void mmc_blk_remove(struct mmc_card *card) 
	pm_runtime_put_noidle(&card->dev);

	mmc_blk_remove_req(md);

	mmc_set_drvdata(card, NULL);

#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME

	mmc_set_bus_resume_policy(card->host, 0);

#endif

}



static int _mmc_blk_suspend(struct mmc_card *card)

drivers/mmc/core/core.c

+0 −6
Original line number Diff line number Diff line
@@ -2457,12 +2457,6 @@ void mmc_rescan(struct work_struct *work) 


	host->detect_change = 0;



	/* If the card was removed the bus will be marked

	 * as dead - extend the wakelock so userspace

	 * can respond */

	if (host->bus_dead)

		extend_wakelock = 1;



	/*

	 * Let mmc_bus_put() free the bus/bus_ops if we've found that

	 * the card is no longer present.