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

The GSI general 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 203d079..cb67608 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -271,7 +271,7 @@ static void gsi_irq_enable(struct gsi *gsi)
        iowrite32(val, gsi->virt + GSI_CNTXT_GLOB_IRQ_EN_OFFSET);
 
        /* Never enable GSI_BREAK_POINT */
-       val = GSI_CNTXT_GSI_IRQ_ALL & ~EN_BREAK_POINT_FMASK;
+       val = GSI_CNTXT_GSI_IRQ_ALL & ~BREAK_POINT_FMASK;
        iowrite32(val, gsi->virt + GSI_CNTXT_GSI_IRQ_EN_OFFSET);
 }
 

diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h
index b789e0f..8e0e935 100644 (file)
--- a/drivers/net/ipa/gsi_reg.h
+++ b/drivers/net/ipa/gsi_reg.h
@@ -340,29 +340,20 @@
                        GSI_EE_N_CNTXT_GSI_IRQ_STTS_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GSI_IRQ_STTS_OFFSET(ee) \
                        (0x0001f118 + 0x4000 * (ee))
-#define BREAK_POINT_FMASK              GENMASK(0, 0)
-#define BUS_ERROR_FMASK                        GENMASK(1, 1)
-#define CMD_FIFO_OVRFLOW_FMASK         GENMASK(2, 2)
-#define MCS_STACK_OVRFLOW_FMASK                GENMASK(3, 3)
-
 #define GSI_CNTXT_GSI_IRQ_EN_OFFSET \
                        GSI_EE_N_CNTXT_GSI_IRQ_EN_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GSI_IRQ_EN_OFFSET(ee) \
                        (0x0001f120 + 0x4000 * (ee))
-#define EN_BREAK_POINT_FMASK           GENMASK(0, 0)
-#define EN_BUS_ERROR_FMASK             GENMASK(1, 1)
-#define EN_CMD_FIFO_OVRFLOW_FMASK      GENMASK(2, 2)
-#define EN_MCS_STACK_OVRFLOW_FMASK     GENMASK(3, 3)
-#define GSI_CNTXT_GSI_IRQ_ALL          GENMASK(3, 0)
-
 #define GSI_CNTXT_GSI_IRQ_CLR_OFFSET \
                        GSI_EE_N_CNTXT_GSI_IRQ_CLR_OFFSET(GSI_EE_AP)
 #define GSI_EE_N_CNTXT_GSI_IRQ_CLR_OFFSET(ee) \
                        (0x0001f128 + 0x4000 * (ee))
-#define CLR_BREAK_POINT_FMASK          GENMASK(0, 0)
-#define CLR_BUS_ERROR_FMASK            GENMASK(1, 1)
-#define CLR_CMD_FIFO_OVRFLOW_FMASK     GENMASK(2, 2)
-#define CLR_MCS_STACK_OVRFLOW_FMASK    GENMASK(3, 3)
+/* The masks below are used for the general IRQ STTS, EN, and CLR registers */
+#define BREAK_POINT_FMASK              GENMASK(0, 0)
+#define BUS_ERROR_FMASK                        GENMASK(1, 1)
+#define CMD_FIFO_OVRFLOW_FMASK         GENMASK(2, 2)
+#define MCS_STACK_OVRFLOW_FMASK                GENMASK(3, 3)
+#define GSI_CNTXT_GSI_IRQ_ALL          GENMASK(3, 0)
 
 #define GSI_CNTXT_INTSET_OFFSET \
                        GSI_EE_N_CNTXT_INTSET_OFFSET(GSI_EE_AP)