scsi: hisi_sas: Rename hisi_sas_cq.pci_irq_mask

BugLink: https://launchpad.net/bugs/1867587
In future we will want to use hisi_sas_cq.pci_irq_mask for non-pci
interrupt masks, so rename to be more general.

Link: https://lore.kernel.org/r/1579522957-4393-7-git-send-email-john.garry@huawei.com
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 11e673206f217ce6604b7b0269e3cfc65171c380)
Signed-off-by: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 838549b19f867030c101c3b379eb3cc668455d1e..2bdd64648ef0e4c01e63c6845237e9ad6b57971d 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -180,7 +180,7 @@ struct hisi_sas_port {
 
 struct hisi_sas_cq {
        struct hisi_hba *hisi_hba;
-       const struct cpumask *pci_irq_mask;
+       const struct cpumask *irq_mask;
        int     rd_point;
        int     id;
        int     irq_no;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 77a47c5144dcaf70cdaa75ccecc9462fb32ae02f..a5707a3d690a3bb0aa6d849532eec31d7ba52ce2 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -2125,7 +2125,7 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
        case HISI_SAS_INT_ABT_DEV:
                for (i = 0; i < hisi_hba->cq_nvecs; i++) {
                        struct hisi_sas_cq *cq = &hisi_hba->cq[i];
-                       const struct cpumask *mask = cq->pci_irq_mask;
+                       const struct cpumask *mask = cq->irq_mask;
 
                        if (mask && !cpumask_intersects(cpu_online_mask, mask))
                                continue;

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index d9b51750b3a7a4bcb2bf6070898be56426857af4..4ab7b090c27d4cdc1f00f35e3c99513b29c94427 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2372,7 +2372,7 @@ static void setup_reply_map_v3_hw(struct hisi_hba *hisi_hba, int nvecs)
                                            BASE_VECTORS_V3_HW);
                if (!mask)
                        goto fallback;
-               cq->pci_irq_mask = mask;
+               cq->irq_mask = mask;
                for_each_cpu(cpu, mask)
                        hisi_hba->reply_map[cpu] = queue;
        }