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

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

ms_block: remove pointless prep_fn 



This driver will never see non-fs requests, and doesn't do anything
else in the prep_fn.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 261c83c1

drivers/memstick/core/ms_block.c

+0 −11
Original line number Diff line number Diff line
@@ -2000,16 +2000,6 @@ static int msb_bd_getgeo(struct block_device *bdev, 
	return 0;

}



static int msb_prepare_req(struct request_queue *q, struct request *req)

{

	if (req->cmd_type != REQ_TYPE_FS) {

		blk_dump_rq_flags(req, "MS unsupported request");

		return BLKPREP_KILL;

	}

	req->rq_flags |= RQF_DONTPREP;

	return BLKPREP_OK;

}



static void msb_submit_req(struct request_queue *q)

{

	struct memstick_dev *card = q->queuedata;
@@ -2132,7 +2122,6 @@ static int msb_init_disk(struct memstick_dev *card) 
	}



	msb->queue->queuedata = card;

	blk_queue_prep_rq(msb->queue, msb_prepare_req);



	blk_queue_bounce_limit(msb->queue, limit);

	blk_queue_max_hw_sectors(msb->queue, MS_BLOCK_MAX_PAGES);