[RFC PATCH 21/21] nvme-pci: use lib tagset init helper

Chaitanya Kulkarni
2022-10-05T03:32:33Z

drivers/nvme/host/pci.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 7bbffd2a9beb..52af4b2bb668 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1757,15 +1757,9 @@ static int nvme_pci_alloc_admin_tag_set(struct nvme_dev *dev)
{
struct blk_mq_tag_set *set = &dev->admin_tagset;

- set->ops = &nvme_mq_admin_ops;
- set->nr_hw_queues = 1;
-
- set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;
- set->timeout = NVME_ADMIN_TIMEOUT;
- set->numa_node = dev->ctrl.numa_node;
- set->cmd_size = sizeof(struct nvme_iod);
- set->flags = BLK_MQ_F_NO_SCHED;
- set->driver_data = dev;
+ blk_mq_init_tag_set(set, &nvme_mq_admin_ops, 1, NVME_AQ_MQ_TAG_DEPTH,
+ sizeof(struct nvme_iod), dev->ctrl.numa_node,
+ NVME_ADMIN_TIMEOUT, BLK_MQ_F_NO_SCHED, dev);

if (blk_mq_alloc_tag_set(set))
return -ENOMEM;
@@ -2528,20 +2522,15 @@ static void nvme_pci_alloc_tag_set(struct nvme_dev *dev)
struct blk_mq_tag_set * set = &dev->tagset;
int ret;

- set->ops = &nvme_mq_ops;
- set->nr_hw_queues = dev->online_queues - 1;
set->nr_maps = 1;
if (dev->io_queues[HCTX_TYPE_READ])
set->nr_maps = 2;
if (dev->io_queues[HCTX_TYPE_POLL])
set->nr_maps = 3;
- set->timeout = NVME_IO_TIMEOUT;
- set->numa_node = dev->ctrl.numa_node;
- set->queue_depth = min_t(unsigned, dev->q_depth, BLK_MQ_MAX_DEPTH) - 1;
- set->cmd_size = sizeof(struct nvme_iod);
- set->flags = BLK_MQ_F_SHOULD_MERGE;
- set->driver_data = dev;
-
+ blk_mq_init_tag_set(set, &nvme_mq_ops, dev->online_queues - 1,
+ min_t(unsigned, dev->q_depth, BLK_MQ_MAX_DEPTH) - 1,
+ sizeof(struct nvme_iod), dev->ctrl.numa_node,
+ NVME_IO_TIMEOUT, BLK_MQ_F_SHOULD_MERGE, dev);
/*
* Some Apple controllers requires tags to be unique
* across admin and IO queue, so reserve the first 32
--
2.29.0