From 3c27b16eae473c30798ae2b173b38f35a5ac99ea Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@intel.com>
Date: Thu, 23 Jun 2011 13:40:29 +0300
Subject: [PATCH] --- yaml --- r: 254094 b: refs/heads/master c:
 c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/card/queue.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 45c407ff0702..3f514296a365 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d09408ade08a08a710a247fb52aa50101e73ebf7
+refs/heads/master: c31b55cd4eaf050bb5a15bd8251da1b3c7edeb1c
diff --git a/trunk/drivers/mmc/card/queue.c b/trunk/drivers/mmc/card/queue.c
index 3e2db1cf1cbb..6413afa318d2 100644
--- a/trunk/drivers/mmc/card/queue.c
+++ b/trunk/drivers/mmc/card/queue.c
@@ -135,12 +135,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
 		mq->queue->limits.max_discard_sectors = UINT_MAX;
 		if (card->erased_byte == 0)
 			mq->queue->limits.discard_zeroes_data = 1;
-		if (!mmc_can_trim(card) && is_power_of_2(card->erase_size)) {
-			mq->queue->limits.discard_granularity =
-							card->erase_size << 9;
-			mq->queue->limits.discard_alignment =
-							card->erase_size << 9;
-		}
+		mq->queue->limits.discard_granularity = card->pref_erase << 9;
 		if (mmc_can_secure_erase_trim(card))
 			queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD,
 						mq->queue);