aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick/core/ms_block.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-05-09 15:59:44 +0200
committerJens Axboe <axboe@kernel.dk>2018-05-11 15:07:55 -0600
commit7c2d748e847695c89427fb23a7d5ab0a04ad2ccc (patch)
tree52fafb3856eeafd371a76ae103d1bbb21b3a0f76 /drivers/memstick/core/ms_block.c
parentDAC960: don't use block layer bounce buffers (diff)
downloadlinux-dev-7c2d748e847695c89427fb23a7d5ab0a04ad2ccc.tar.xz
linux-dev-7c2d748e847695c89427fb23a7d5ab0a04ad2ccc.zip
memstick: don't call blk_queue_bounce_limit
All in-tree host drivers set up a proper dma mask and use the dma-mapping helpers. This means they will be able to deal with any address that we are throwing at them. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/memstick/core/ms_block.c')
-rw-r--r--drivers/memstick/core/ms_block.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 57b13dfbd21e..b2d025f42d14 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -2096,12 +2096,8 @@ static int msb_init_disk(struct memstick_dev *card)
struct msb_data *msb = memstick_get_drvdata(card);
struct memstick_host *host = card->host;
int rc;
- u64 limit = BLK_BOUNCE_HIGH;
unsigned long capacity;
- if (host->dev.dma_mask && *(host->dev.dma_mask))
- limit = *(host->dev.dma_mask);
-
mutex_lock(&msb_disk_lock);
msb->disk_id = idr_alloc(&msb_disk_idr, card, 0, 256, GFP_KERNEL);
mutex_unlock(&msb_disk_lock);
@@ -2123,7 +2119,6 @@ static int msb_init_disk(struct memstick_dev *card)
msb->queue->queuedata = card;
- blk_queue_bounce_limit(msb->queue, limit);
blk_queue_max_hw_sectors(msb->queue, MS_BLOCK_MAX_PAGES);
blk_queue_max_segments(msb->queue, MS_BLOCK_MAX_SEGS);
blk_queue_max_segment_size(msb->queue,