From: Chaitanya Kulkarni <chaitanyak@nvidia.com>
To: <linux-nvme@lists.infradead.org>
Cc: <hch@lst.de>, <kbusch@kernel.org>, <sagi@grimberg.me>,
Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH 6/9] nvme-pci: use helper for tagset initialization
Date: Fri, 28 Jan 2022 01:20:12 -0800 [thread overview]
Message-ID: <20220128092015.19289-7-chaitanyak@nvidia.com> (raw)
In-Reply-To: <20220128092015.19289-1-chaitanyak@nvidia.com>
From: Chaitanya Kulkarni <kch@nvidia.com>
Use helper to remove duplicate code for admin tag initialization
for all transports.
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/host/pci.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 6a99ed680915..87bdccd85eff 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1755,15 +1755,10 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev)
static int nvme_alloc_admin_tags(struct nvme_dev *dev)
{
if (!dev->ctrl.admin_q) {
- dev->admin_tagset.ops = &nvme_mq_admin_ops;
- dev->admin_tagset.nr_hw_queues = 1;
-
- dev->admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;
- dev->admin_tagset.timeout = NVME_ADMIN_TIMEOUT;
- dev->admin_tagset.numa_node = dev->ctrl.numa_node;
+ nvme_init_admin_tagset(&(dev->admin_tagset), dev,
+ dev->ctrl.numa_node, &nvme_mq_admin_ops,
+ BLK_MQ_F_NO_SCHED, 0);
dev->admin_tagset.cmd_size = sizeof(struct nvme_iod);
- dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED;
- dev->admin_tagset.driver_data = dev;
if (blk_mq_alloc_tag_set(&dev->admin_tagset))
return -ENOMEM;
--
2.29.0
next prev parent reply other threads:[~2022-01-28 9:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 9:20 [PATCH 0/9] nvme: add helpers and remove duplicate code Chaitanya Kulkarni
2022-01-28 9:20 ` [PATCH 1/9] nvme-fc: add a helper to initialize connect_q Chaitanya Kulkarni
2022-01-28 9:23 ` Chaitanya Kulkarni
2022-01-30 9:44 ` Sagi Grimberg
2022-02-01 8:09 ` Christoph Hellwig
2022-01-28 9:20 ` [PATCH 2/9] nvme-rdma: use " Chaitanya Kulkarni
2022-01-30 9:44 ` Sagi Grimberg
2022-01-28 9:20 ` [PATCH 3/9] nvme-tcp: " Chaitanya Kulkarni
2022-01-30 9:44 ` Sagi Grimberg
2022-01-28 9:20 ` [PATCH 4/9] nvme-loop: " Chaitanya Kulkarni
2022-01-30 9:44 ` Sagi Grimberg
2022-01-28 9:20 ` [PATCH 5/9] nvme-fc: centralize admin tagset initialization Chaitanya Kulkarni
2022-01-28 9:23 ` Chaitanya Kulkarni
2022-01-30 9:47 ` Sagi Grimberg
2022-02-02 6:48 ` Chaitanya Kulkarni
2022-02-01 8:11 ` Christoph Hellwig
2022-02-02 6:46 ` Chaitanya Kulkarni
2022-01-28 9:20 ` Chaitanya Kulkarni [this message]
2022-01-28 9:20 ` [PATCH 7/9] nvme-rdma: use helper for " Chaitanya Kulkarni
2022-01-28 9:20 ` [PATCH 8/9] nvme-tcp: " Chaitanya Kulkarni
2022-01-28 9:20 ` [PATCH 9/9] nvme-loop: " Chaitanya Kulkarni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220128092015.19289-7-chaitanyak@nvidia.com \
--to=chaitanyak@nvidia.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.