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

scsi: 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 avatarMartin K. Petersen <martin.petersen@oracle.com>
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-5-27211e9c2cd5@kernel.org


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

drivers/scsi/fnic/fnic_main.c

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/spinlock.h>

#include <linux/workqueue.h>

#include <linux/if_ether.h>

#include <linux/blk-mq-pci.h>

#include <scsi/fc/fc_fip.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport.h>
@@ -601,7 +600,7 @@ void fnic_mq_map_queues_cpus(struct Scsi_Host *host) 
		return;

	}



	blk_mq_pci_map_queues(qmap, l_pdev, FNIC_PCI_OFFSET);

	blk_mq_map_hw_queues(qmap, &l_pdev->dev, FNIC_PCI_OFFSET);

}



static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

drivers/scsi/hisi_sas/hisi_sas.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/acpi.h>

#include <linux/blk-mq.h>

#include <linux/blk-mq-pci.h>

#include <linux/clk.h>

#include <linux/debugfs.h>

#include <linux/dmapool.h>

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+2 −2
Original line number Diff line number Diff line
@@ -3328,7 +3328,7 @@ static void hisi_sas_map_queues(struct Scsi_Host *shost) 
		if (i == HCTX_TYPE_POLL)

			blk_mq_map_queues(qmap);

		else

			blk_mq_pci_map_queues(qmap, hisi_hba->pci_dev,

			blk_mq_map_hw_queues(qmap, hisi_hba->dev,

					     BASE_VECTORS_V3_HW);

		qoff += qmap->nr_queues;

	}

drivers/scsi/megaraid/megaraid_sas_base.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <linux/poll.h>

#include <linux/vmalloc.h>

#include <linux/irq_poll.h>

#include <linux/blk-mq-pci.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -3193,7 +3192,7 @@ static void megasas_map_queues(struct Scsi_Host *shost) 
	map = &shost->tag_set.map[HCTX_TYPE_DEFAULT];

	map->nr_queues = instance->msix_vectors - offset;

	map->queue_offset = 0;

	blk_mq_pci_map_queues(map, instance->pdev, offset);

	blk_mq_map_hw_queues(map, &instance->pdev->dev, offset);

	qoff += map->nr_queues;

	offset += map->nr_queues;

drivers/scsi/mpi3mr/mpi3mr.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include <linux/blkdev.h>

#include <linux/blk-mq.h>

#include <linux/blk-mq-pci.h>

#include <linux/delay.h>

#include <linux/dmapool.h>

#include <linux/errno.h>