Commit 4425f649 authored by Daniel Wagner's avatar Daniel Wagner Committed by Jens Axboe
Browse files

nvme: replace blk_mq_pci_map_queues with blk_mq_map_hw_queues 



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

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarDaniel Wagner <wagi@kernel.org>
Link: https://lore.kernel.org/r/20241202-refactor-blk-affinity-helpers-v6-6-27211e9c2cd5@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bd326a5a

drivers/nvme/host/fc.c

+0 −1
Original line number Diff line number Diff line
@@ -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 ****************** */

drivers/nvme/host/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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>
@@ -463,7 +462,7 @@ 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_map_hw_queues(map, dev->dev, offset);

		else

			blk_mq_map_queues(map);

		qoff += map->nr_queues;