net: ipa: share field mask values for GSI global interrupt

The GSI global interrupt is managed by three registers: enable;
status; and clear.  The three registers have same set of field bits
at the same locations.  Use a common set of field masks for all
three registers to avoid duplication.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 745717477cad360218c928213c4035f00e02653d..203d079c481c4f3a37fb0f77d871643b025c0fd0 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -1074,8 +1074,8 @@ static void gsi_isr_glob_ee(struct gsi *gsi)
 
        val &= ~ERROR_INT_FMASK;
 
-       if (val & EN_GP_INT1_FMASK) {
-               val ^= EN_GP_INT1_FMASK;
+       if (val & GP_INT1_FMASK) {
+               val ^= GP_INT1_FMASK;
                gsi_isr_gp_int1(gsi);
        }
 

diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h
index 598db57a68dfbc989e67c99faccc7282269a5de9..b789e0f866fa0b1422b7ec2b189a96c890b003af 100644 (file)
--- a/drivers/net/ipa/gsi_reg.h
+++ b/drivers/net/ipa/gsi_reg.h
@@ -321,29 +321,20 @@
                        GSI_EE_N_CNTXT_GLOB_IRQ_STTS_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GLOB_IRQ_STTS_OFFSET(ee) \
                        (0x0001f100 + 0x4000 * (ee))
-#define ERROR_INT_FMASK                        GENMASK(0, 0)
-#define GP_INT1_FMASK                  GENMASK(1, 1)
-#define GP_INT2_FMASK                  GENMASK(2, 2)
-#define GP_INT3_FMASK                  GENMASK(3, 3)
-
 #define GSI_CNTXT_GLOB_IRQ_EN_OFFSET \
                        GSI_EE_N_CNTXT_GLOB_IRQ_EN_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GLOB_IRQ_EN_OFFSET(ee) \
                        (0x0001f108 + 0x4000 * (ee))
-#define EN_ERROR_INT_FMASK             GENMASK(0, 0)
-#define EN_GP_INT1_FMASK               GENMASK(1, 1)
-#define EN_GP_INT2_FMASK               GENMASK(2, 2)
-#define EN_GP_INT3_FMASK               GENMASK(3, 3)
-#define GSI_CNTXT_GLOB_IRQ_ALL         GENMASK(3, 0)
-
 #define GSI_CNTXT_GLOB_IRQ_CLR_OFFSET \
                        GSI_EE_N_CNTXT_GLOB_IRQ_CLR_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GLOB_IRQ_CLR_OFFSET(ee) \
                        (0x0001f110 + 0x4000 * (ee))
-#define CLR_ERROR_INT_FMASK            GENMASK(0, 0)
-#define CLR_GP_INT1_FMASK              GENMASK(1, 1)
-#define CLR_GP_INT2_FMASK              GENMASK(2, 2)
-#define CLR_GP_INT3_FMASK              GENMASK(3, 3)
+/* The masks below are used for the general IRQ STTS, EN, and CLR registers */
+#define ERROR_INT_FMASK                        GENMASK(0, 0)
+#define GP_INT1_FMASK                  GENMASK(1, 1)
+#define GP_INT2_FMASK                  GENMASK(2, 2)
+#define GP_INT3_FMASK                  GENMASK(3, 3)
+#define GSI_CNTXT_GLOB_IRQ_ALL         GENMASK(3, 0)
 
 #define GSI_CNTXT_GSI_IRQ_STTS_OFFSET \
                        GSI_EE_N_CNTXT_GSI_IRQ_STTS_OFFSET(GSI_EE_AP)