Merge branch 'for-4.11/next' into for-4.11/linus-merge

Signed-off-by: Jens Axboe <axboe@fb.com>

2 files changed, 0 insertions, 24 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);
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);