diff options
author | Christoph Hellwig <hch@lst.de> | 2017-04-05 13:21:19 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-04-08 13:25:38 -0400 |
commit | 5d1429fead5beacce6df052c31b28a97a11e250b (patch) | |
tree | 7943caaa11a09692a59c9285a6d6763e39981caf /drivers/mmc/core/queue.c | |
parent | 274243f5457ab60eef8a9493684cb4c4c846425e (diff) |
mmc: remove the discard_zeroes_data flag
mmc only supports discarding on large alignments, so the zeroing code
would always fall back to explicit writings of zeroes.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/mmc/core/queue.c')
-rw-r--r-- | drivers/mmc/core/queue.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 493eb10ce580..4c54ad34e17a 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c | |||
@@ -167,8 +167,6 @@ static void mmc_queue_setup_discard(struct request_queue *q, | |||
167 | 167 | ||
168 | queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); | 168 | queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q); |
169 | blk_queue_max_discard_sectors(q, max_discard); | 169 | blk_queue_max_discard_sectors(q, max_discard); |
170 | if (card->erased_byte == 0 && !mmc_can_discard(card)) | ||
171 | q->limits.discard_zeroes_data = 1; | ||
172 | q->limits.discard_granularity = card->pref_erase << 9; | 170 | q->limits.discard_granularity = card->pref_erase << 9; |
173 | /* granularity must not be greater than max. discard */ | 171 | /* granularity must not be greater than max. discard */ |
174 | if (card->pref_erase > max_discard) | 172 | if (card->pref_erase > max_discard) |