summaryrefslogtreecommitdiff
path: root/drivers/nvme
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-12-02 17:46:27 +0100
committerJens Axboe <axboe@kernel.dk>2018-12-04 11:38:19 -0700
commit376f7ef8bfeaee3993c2e85df1bbaa06725b9342 (patch)
tree9a7bf2119d51f020f30f2426ecde3af333c4ea07 /drivers/nvme
parent529262d56dbebe6a26df5d2fd24cc0e1bc8579e5 (diff)
block: only allow polling if a poll queue_map exists
This avoids having to have differnet mq_ops for different setups with or without poll queues. Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
-rw-r--r--drivers/nvme/host/pci.c29
1 files changed, 9 insertions, 20 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 4ccb4ea22ac6..7732c4979a4e 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1602,22 +1602,15 @@ static const struct blk_mq_ops nvme_mq_admin_ops = {
.timeout = nvme_timeout,
};
-#define NVME_SHARED_MQ_OPS \
- .queue_rq = nvme_queue_rq, \
- .commit_rqs = nvme_commit_rqs, \
- .complete = nvme_pci_complete_rq, \
- .init_hctx = nvme_init_hctx, \
- .init_request = nvme_init_request, \
- .map_queues = nvme_pci_map_queues, \
- .timeout = nvme_timeout \
-
static const struct blk_mq_ops nvme_mq_ops = {
- NVME_SHARED_MQ_OPS,
-};
-
-static const struct blk_mq_ops nvme_mq_poll_ops = {
- NVME_SHARED_MQ_OPS,
- .poll = nvme_poll,
+ .queue_rq = nvme_queue_rq,
+ .complete = nvme_pci_complete_rq,
+ .commit_rqs = nvme_commit_rqs,
+ .init_hctx = nvme_init_hctx,
+ .init_request = nvme_init_request,
+ .map_queues = nvme_pci_map_queues,
+ .timeout = nvme_timeout,
+ .poll = nvme_poll,
};
static void nvme_dev_remove_admin(struct nvme_dev *dev)
@@ -2304,11 +2297,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
int ret;
if (!dev->ctrl.tagset) {
- if (dev->io_queues[HCTX_TYPE_POLL])
- dev->tagset.ops = &nvme_mq_poll_ops;
- else
- dev->tagset.ops = &nvme_mq_ops;
-
+ dev->tagset.ops = &nvme_mq_ops;
dev->tagset.nr_hw_queues = dev->online_queues - 1;
dev->tagset.nr_maps = HCTX_MAX_TYPES;
dev->tagset.timeout = NVME_IO_TIMEOUT;