summaryrefslogtreecommitdiffstats
path: root/drivers/memstick/core
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-01-31 16:57:25 +0100
committerJens Axboe <axboe@fb.com>2017-01-31 14:00:15 -0700
commitcf22f802fc346742237c7d817be33ed57958f2d7 (patch)
tree0a8ef3fb882bf6cbe79ef398da72092382b555c3 /drivers/memstick/core
parent261c83c1a9e5b74e41037cc804e8b9ae21623ddd (diff)
downloadlinux-stable-cf22f802fc346742237c7d817be33ed57958f2d7.tar.gz
linux-stable-cf22f802fc346742237c7d817be33ed57958f2d7.tar.bz2
linux-stable-cf22f802fc346742237c7d817be33ed57958f2d7.zip
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: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/memstick/core')
-rw-r--r--drivers/memstick/core/ms_block.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index f3512404bc52..99e651c27fb7 100644
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -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);