cxgb4: Cleanup macros so they follow the same style and look consistent

Various patches have ended up changing the style of the symbolic macros/register
to different style.

As a result, the current kernel.org files are a mix of different macro styles.
Since this macro/register defines is used by different drivers a
few patch series have ended up adding duplicate macro/register define entries
with different styles. This makes these register define/macro files a complete
mess and we want to make them clean and consistent. This patch cleans up a part
of it.

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 22 insertions, 20 deletions

diff --git a/drivers/scsi/csiostor/csio_hw_t4.c b/drivers/scsi/csiostor/csio_hw_t4.c
index 89ecbac5478f..95d831857640 100644
--- a/drivers/scsi/csiostor/csio_hw_t4.c
+++ b/drivers/scsi/csiostor/csio_hw_t4.c
@@ -307,12 +307,12 @@ csio_t4_memory_rw(struct csio_hw *hw, u32 win, int mtype, u32 addr,
          * MEM_EDC1 = 1
          * MEM_MC   = 2 -- T4
          */
-        edc_size  = EDRAM_SIZE_GET(csio_rd_reg32(hw, MA_EDRAM0_BAR));
+        edc_size  = EDRAM0_SIZE_G(csio_rd_reg32(hw, MA_EDRAM0_BAR_A));
         if (mtype != MEM_MC1)
                 memoffset = (mtype * (edc_size * 1024 * 1024));
         else {
-                mc_size = EXT_MEM_SIZE_GET(csio_rd_reg32(hw,
-                                                         MA_EXT_MEMORY_BAR));
+                mc_size = EXT_MEM_SIZE_G(csio_rd_reg32(hw,
+                                                       MA_EXT_MEMORY_BAR_A));
                 memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024;
         }
 
@@ -383,11 +383,12 @@ static void
 csio_t4_dfs_create_ext_mem(struct csio_hw *hw)
 {
         u32 size;
-        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE);
-        if (i & EXT_MEM_ENABLE) {
-                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR);
+        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE_A);
+
+        if (i & EXT_MEM_ENABLE_F) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR_A);
                 csio_add_debugfs_mem(hw, "mc", MEM_MC,
-                                     EXT_MEM_SIZE_GET(size));
+                                     EXT_MEM_SIZE_G(size));
         }
 }
 
diff --git a/drivers/scsi/csiostor/csio_hw_t5.c b/drivers/scsi/csiostor/csio_hw_t5.c
index 27745c170c24..66e180a58718 100644
--- a/drivers/scsi/csiostor/csio_hw_t5.c
+++ b/drivers/scsi/csiostor/csio_hw_t5.c
@@ -298,12 +298,12 @@ csio_t5_memory_rw(struct csio_hw *hw, u32 win, int mtype, u32 addr,
          * MEM_MC0  = 2 -- For T5
          * MEM_MC1  = 3 -- For T5
          */
-        edc_size  = EDRAM_SIZE_GET(csio_rd_reg32(hw, MA_EDRAM0_BAR));
+        edc_size  = EDRAM0_SIZE_G(csio_rd_reg32(hw, MA_EDRAM0_BAR_A));
         if (mtype != MEM_MC1)
                 memoffset = (mtype * (edc_size * 1024 * 1024));
         else {
-                mc_size = EXT_MEM_SIZE_GET(csio_rd_reg32(hw,
-                                                         MA_EXT_MEMORY_BAR));
+                mc_size = EXT_MEM_SIZE_G(csio_rd_reg32(hw,
+                                                       MA_EXT_MEMORY_BAR_A));
                 memoffset = (MEM_MC0 * edc_size + mc_size) * 1024 * 1024;
         }
 
@@ -372,16 +372,17 @@ static void
 csio_t5_dfs_create_ext_mem(struct csio_hw *hw)
 {
         u32 size;
-        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE);
-        if (i & EXT_MEM_ENABLE) {
-                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR);
+        int i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE_A);
+
+        if (i & EXT_MEM_ENABLE_F) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY_BAR_A);
                 csio_add_debugfs_mem(hw, "mc0", MEM_MC0,
-                                     EXT_MEM_SIZE_GET(size));
+                                     EXT_MEM_SIZE_G(size));
         }
-        if (i & EXT_MEM1_ENABLE) {
-                size = csio_rd_reg32(hw, MA_EXT_MEMORY1_BAR);
+        if (i & EXT_MEM1_ENABLE_F) {
+                size = csio_rd_reg32(hw, MA_EXT_MEMORY1_BAR_A);
                 csio_add_debugfs_mem(hw, "mc1", MEM_MC1,
-                                     EXT_MEM_SIZE_GET(size));
+                                     EXT_MEM_SIZE_G(size));
         }
 }
 
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 17794add855c..70e1eb6d9640 100644
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -128,10 +128,10 @@ static int csio_setup_debugfs(struct csio_hw *hw)
         if (IS_ERR_OR_NULL(hw->debugfs_root))
                 return -1;
 
-        i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE);
-        if (i & EDRAM0_ENABLE)
+        i = csio_rd_reg32(hw, MA_TARGET_MEM_ENABLE_A);
+        if (i & EDRAM0_ENABLE_F)
                 csio_add_debugfs_mem(hw, "edc0", MEM_EDC0, 5);
-        if (i & EDRAM1_ENABLE)
+        if (i & EDRAM1_ENABLE_F)
                 csio_add_debugfs_mem(hw, "edc1", MEM_EDC1, 5);
 
         hw->chip_ops->chip_dfs_create_ext_mem(hw);