OSDN Git Service

ms_block: remove pointless prep_fn
authorChristoph Hellwig <hch@lst.de>
Tue, 31 Jan 2017 15:57:25 +0000 (16:57 +0100)
committerJens Axboe <axboe@fb.com>
Tue, 31 Jan 2017 21:00:15 +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/ms_block.c

index f351240..99e651c 100644 (file)
@@ -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);