summaryrefslogtreecommitdiff
path: root/drivers/block/mtip32xx/mtip32xx.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-05-28 10:18:51 -0600
committerJens Axboe <axboe@fb.com>2014-05-28 10:18:51 -0600
commit0fb662e2250afdf2c54253dbf2063dc9d8369b69 (patch)
tree6a1014ab27531dae2702894e9e3cb6cdad9f0d60 /drivers/block/mtip32xx/mtip32xx.c
parent6178976500ae61fa7b12ebb2d3de816dc9396388 (diff)
parentcdef54dd85ad66e77262ea57796a3e81683dd5d6 (diff)
Merge branch 'for-3.16/core' into for-3.16/drivers
Pull in core changes (again), since we got rid of the alloc/free hctx mq_ops hooks and mtip32xx then needed updating again. Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/mtip32xx/mtip32xx.c')
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index ea323e91903b..74abd49fabdc 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3832,8 +3832,6 @@ static int mtip_init_cmd(void *data, struct request *rq, unsigned int hctx_idx,
static struct blk_mq_ops mtip_mq_ops = {
.queue_rq = mtip_queue_rq,
.map_queue = blk_mq_map_queue,
- .alloc_hctx = blk_mq_alloc_single_hw_queue,
- .free_hctx = blk_mq_free_single_hw_queue,
.init_request = mtip_init_cmd,
.exit_request = mtip_free_cmd,
};