mspro_block: remove pointless prep_fn
authorChristoph Hellwig <hch@lst.de>
Tue, 31 Jan 2017 15:57:26 +0000 (16:57 +0100)
committerJens Axboe <axboe@fb.com>
Tue, 31 Jan 2017 21:00:20 +0000 (14:00 -0700)
This driver will never see non-fs requests, and doesn't do anything
else in the prep_fn.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/memstick/core/mspro_block.c

index fa0746d182ff50c23189dabd22fe82a2287bd671..c00d8a266878035cafa9bc6570ca73d67b1da372 100644 (file)
@@ -827,18 +827,6 @@ static void mspro_block_start(struct memstick_dev *card)
        spin_unlock_irqrestore(&msb->q_lock, flags);
 }
 
-static int mspro_block_prepare_req(struct request_queue *q, struct request *req)
-{
-       if (req->cmd_type != REQ_TYPE_FS) {
-               blk_dump_rq_flags(req, "MSPro unsupported request");
-               return BLKPREP_KILL;
-       }
-
-       req->rq_flags |= RQF_DONTPREP;
-
-       return BLKPREP_OK;
-}
-
 static void mspro_block_submit_req(struct request_queue *q)
 {
        struct memstick_dev *card = q->queuedata;
@@ -1228,7 +1216,6 @@ static int mspro_block_init_disk(struct memstick_dev *card)
        }
 
        msb->queue->queuedata = card;
-       blk_queue_prep_rq(msb->queue, mspro_block_prepare_req);
 
        blk_queue_bounce_limit(msb->queue, limit);
        blk_queue_max_hw_sectors(msb->queue, MSPRO_BLOCK_MAX_PAGES);