summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-01-31 16:57:26 +0100
committerJens Axboe <axboe@fb.com>2017-01-31 14:00:20 -0700
commit55460a8a7e6f42ecc62f24277effbcc0bc78a1e4 (patch)
tree987bb3a603dfe977637c808c067115569ba973fe
parentcf22f802fc346742237c7d817be33ed57958f2d7 (diff)
downloadlinux-stable-55460a8a7e6f42ecc62f24277effbcc0bc78a1e4.tar.gz
linux-stable-55460a8a7e6f42ecc62f24277effbcc0bc78a1e4.tar.bz2
linux-stable-55460a8a7e6f42ecc62f24277effbcc0bc78a1e4.zip
mspro_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: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/memstick/core/mspro_block.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index fa0746d182ff..c00d8a266878 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -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);