scsi: hisi_sas: Replace magic number when handle channel interrupt

We use magic number as offset and mask when handle channel interrupt, so
use macro to replace it.

Link: https://lore.kernel.org/r/1579522957-4393-4-git-send-email-john.garry@huawei.com
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 34a3781a2a852ea351dba508e47c79b0fd97de51..878530f6945f003d95e2e738048e3d9a95863508 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -495,6 +495,13 @@ struct hisi_sas_err_record_v3 {
 #define BASE_VECTORS_V3_HW  16
 #define MIN_AFFINE_VECTORS_V3_HW  (BASE_VECTORS_V3_HW + 1)
 
+#define CHNL_INT_STS_MSK       0xeeeeeeee
+#define CHNL_INT_STS_PHY_MSK   0xe
+#define CHNL_INT_STS_INT0_MSK BIT(1)
+#define CHNL_INT_STS_INT1_MSK BIT(2)
+#define CHNL_INT_STS_INT2_MSK BIT(3)
+#define CHNL_WIDTH 4
+
 enum {
        DSM_FUNC_ERR_HANDLE_MSI = 0,
 };
@@ -1819,19 +1826,19 @@ static irqreturn_t int_chnl_int_v3_hw(int irq_no, void *p)
        int phy_no = 0;
 
        irq_msk = hisi_sas_read32(hisi_hba, CHNL_INT_STATUS)
-                               & 0xeeeeeeee;
+                 & CHNL_INT_STS_MSK;
 
        while (irq_msk) {
-               if (irq_msk & (2 << (phy_no * 4)))
+               if (irq_msk & (CHNL_INT_STS_INT0_MSK << (phy_no * CHNL_WIDTH)))
                        handle_chl_int0_v3_hw(hisi_hba, phy_no);
 
-               if (irq_msk & (4 << (phy_no * 4)))
+               if (irq_msk & (CHNL_INT_STS_INT1_MSK << (phy_no * CHNL_WIDTH)))
                        handle_chl_int1_v3_hw(hisi_hba, phy_no);
 
-               if (irq_msk & (8 << (phy_no * 4)))
+               if (irq_msk & (CHNL_INT_STS_INT2_MSK << (phy_no * CHNL_WIDTH)))
                        handle_chl_int2_v3_hw(hisi_hba, phy_no);
 
-               irq_msk &= ~(0xe << (phy_no * 4));
+               irq_msk &= ~(CHNL_INT_STS_PHY_MSK << (phy_no * CHNL_WIDTH));
                phy_no++;
        }