diff mbox series

[RFC,3/6] virtio-blk: use init alloc tagset helper

Message ID 20221010170026.49808-4-kch@nvidia.com (mailing list archive)
State New, archived
Headers show
Series block: add and use tagset init helper | expand

Commit Message

Chaitanya Kulkarni Oct. 10, 2022, 5 p.m. UTC 
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
 drivers/block/virtio_blk.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 23c5a1239520..57333cc90557 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -942,20 +942,17 @@  static int virtblk_probe(struct virtio_device *vdev)
 	}
 
 	memset(&vblk->tag_set, 0, sizeof(vblk->tag_set));
-	vblk->tag_set.ops = &virtio_mq_ops;
-	vblk->tag_set.queue_depth = queue_depth;
 	vblk->tag_set.numa_node = NUMA_NO_NODE;
 	vblk->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
 	vblk->tag_set.cmd_size =
 		sizeof(struct virtblk_req) +
 		sizeof(struct scatterlist) * VIRTIO_BLK_INLINE_SG_CNT;
-	vblk->tag_set.driver_data = vblk;
-	vblk->tag_set.nr_hw_queues = vblk->num_vqs;
 	vblk->tag_set.nr_maps = 1;
 	if (vblk->io_queues[HCTX_TYPE_POLL])
 		vblk->tag_set.nr_maps = 3;
 
-	err = blk_mq_alloc_tag_set(&vblk->tag_set);
+	err = blk_mq_init_alloc_tag_set(&vblk->tag_set, &virtio_mq_ops,
+					vblk->num_vqs, queue_depth, vblk);
 	if (err)
 		goto out_free_vq;