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

Commit 7c2d748e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 00f0a51f

drivers/memstick/core/ms_block.c

+0 −5
Original line number Diff line number Diff line
@@ -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,

drivers/memstick/core/mspro_block.c

+0 −5
Original line number Diff line number Diff line
@@ -1175,12 +1175,8 @@ static int mspro_block_init_disk(struct memstick_dev *card) 
	struct mspro_sys_info *sys_info = NULL;

	struct mspro_sys_attr *s_attr = NULL;

	int rc, disk_id;

	u64 limit = BLK_BOUNCE_HIGH;

	unsigned long capacity;



	if (host->dev.dma_mask && *(host->dev.dma_mask))

		limit = *(host->dev.dma_mask);



	for (rc = 0; msb->attr_group.attrs[rc]; ++rc) {

		s_attr = mspro_from_sysfs_attr(msb->attr_group.attrs[rc]);
@@ -1219,7 +1215,6 @@ static int mspro_block_init_disk(struct memstick_dev *card) 


	msb->queue->queuedata = card;



	blk_queue_bounce_limit(msb->queue, limit);

	blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);

	blk_queue_max_segments(msb->queue, MSPRO_BLOCK_MAX_SEGS);

	blk_queue_max_segment_size(msb->queue,