[4/6] nvme: replace blk_mq_pci_map_queues with blk_mq_hctx_map_queues

Commit Message

Daniel Wagner Sept. 13, 2024, 7:42 a.m. UTC

From: Daniel Wagner <[e-mail]>

Replace all users of blk_mq_pci_map_queues with the more generic
blk_mq_hctx_map_queues. This in preparation to retire
blk_mq_pci_map_queues.

Reviewed-by: Christoph Hellwig <[e-mail]>
Signed-off-by: Daniel Wagner <[e-mail]>
---
 drivers/nvme/host/fc.c  | 1 -
 drivers/nvme/host/pci.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index b81af7919e94..094be164ffdc 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -16,7 +16,6 @@ 
 #include <linux/nvme-fc.h>
 #include "fc.h"
 #include <scsi/scsi_transport_fc.h>
-#include <linux/blk-mq-pci.h>
 
 /* *************************** Data Structures/Defines ****************** */
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 6cd9395ba9ec..4af6931af19f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -8,7 +8,6 @@ 
 #include <linux/async.h>
 #include <linux/blkdev.h>
 #include <linux/blk-mq.h>
-#include <linux/blk-mq-pci.h>
 #include <linux/blk-integrity.h>
 #include <linux/dmi.h>
 #include <linux/init.h>
@@ -457,7 +456,8 @@  static void nvme_pci_map_queues(struct blk_mq_tag_set *set)
 		 */
 		map->queue_offset = qoff;
 		if (i != HCTX_TYPE_POLL && offset)
-			blk_mq_pci_map_queues(map, to_pci_dev(dev->dev), offset);
+			blk_mq_hctx_map_queues(map, to_pci_dev(dev->dev), offset,
+					       pci_get_blk_mq_affinity);
 		else
 			blk_mq_map_queues(map);
 		qoff += map->nr_queues;