Re: [PATCH v3 5/8] scsi: replace blk_mq_pci_map_queues with blk_mq_hctx_map_queues

[John Garry]

On 12/11/2024 13:26, Daniel Wagner wrote:

  #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>
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 
4cd3a3eab6f1c47c962565a74cd7284dad1db12e..7858c807be5eacb70ded5ec9399c6531a4ef6116
 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -3322,8 +3322,8 @@ 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,
-                                             BASE_VECTORS_V3_HW);
+                       blk_mq_hctx_map_queues(qmap, &hisi_hba->pci_dev->dev,

nit: hisi_hba->dev could be used directly

+                                              BASE_VECTORS_V3_HW);

looks ok apart from that

                qoff += qmap->nr_queues;
        }