netxen: sanitize function names

Replace superfluous wrapper functions with two macros:

NXWR32 replaces netxen_nic_reg_write, netxen_nic_write_w0,
netxen_nic_read_w1, netxen_crb_writelit_adapter.

NXRD32 replaces netxen_nic_reg_read, netxen_nic_read_w0,
netxen_nic_read_w1.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 57 insertions, 130 deletions

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 87cda65ef66b..9439f89869de 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -361,22 +361,20 @@ netxen_nic_enable_mcast_filter(struct netxen_adapter *adapter)
         if (adapter->mc_enabled)
                 return 0;
 
-        val = adapter->hw_read_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG);
+        val = NXRD32(adapter, NETXEN_MAC_ADDR_CNTL_REG);
         val |= (1UL << (28+port));
-        adapter->hw_write_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
+        NXWR32(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
 
         /* add broadcast addr to filter */
         val = 0xffffff;
-        netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_UNICAST_ADDR(port, 0)+4, val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0)+4, val);
 
         /* add station addr to filter */
         val = MAC_HI(addr);
-        netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1), val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1), val);
         val = MAC_LO(addr);
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_UNICAST_ADDR(port, 1)+4, val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, val);
 
         adapter->mc_enabled = 1;
         return 0;
@@ -392,18 +390,17 @@ netxen_nic_disable_mcast_filter(struct netxen_adapter *adapter)
         if (!adapter->mc_enabled)
                 return 0;
 
-        val = adapter->hw_read_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG);
+        val = NXRD32(adapter, NETXEN_MAC_ADDR_CNTL_REG);
         val &= ~(1UL << (28+port));
-        adapter->hw_write_wx(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
+        NXWR32(adapter, NETXEN_MAC_ADDR_CNTL_REG, val);
 
         val = MAC_HI(addr);
-        netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0), val);
         val = MAC_LO(addr);
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_UNICAST_ADDR(port, 0)+4, val);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 0)+4, val);
 
-        netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1), 0);
-        netxen_crb_writelit_adapter(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, 0);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1), 0);
+        NXWR32(adapter, NETXEN_UNICAST_ADDR(port, 1)+4, 0);
 
         adapter->mc_enabled = 0;
         return 0;
@@ -419,10 +416,8 @@ netxen_nic_set_mcast_addr(struct netxen_adapter *adapter,
         lo = MAC_LO(addr);
         hi = MAC_HI(addr);
 
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_MCAST_ADDR(port, index), hi);
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_MCAST_ADDR(port, index)+4, lo);
+        NXWR32(adapter, NETXEN_MCAST_ADDR(port, index), hi);
+        NXWR32(adapter, NETXEN_MCAST_ADDR(port, index)+4, lo);
 
         return 0;
 }
@@ -863,8 +858,8 @@ int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
         crbaddr = CRB_MAC_BLOCK_START +
                 (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
 
-        mac_lo = adapter->hw_read_wx(adapter, crbaddr);
-        mac_hi = adapter->hw_read_wx(adapter, crbaddr+4);
+        mac_lo = NXRD32(adapter, crbaddr);
+        mac_hi = NXRD32(adapter, crbaddr+4);
 
         if (pci_func & 1)
                 *mac = le64_to_cpu((mac_lo >> 16) | ((u64)mac_hi << 16));
@@ -882,8 +877,7 @@ static int crb_win_lock(struct netxen_adapter *adapter)
 
         while (!done) {
                 /* acquire semaphore3 from PCI HW block */
-                done = adapter->hw_read_wx(adapter,
-                                NETXEN_PCIE_REG(PCIE_SEM7_LOCK));
+                done = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM7_LOCK));
                 if (done == 1)
                         break;
                 if (timeout >= CRB_WIN_LOCK_TIMEOUT)
@@ -891,8 +885,7 @@ static int crb_win_lock(struct netxen_adapter *adapter)
                 timeout++;
                 udelay(1);
         }
-        netxen_crb_writelit_adapter(adapter,
-                        NETXEN_CRB_WIN_LOCK_ID, adapter->portnum);
+        NXWR32(adapter, NETXEN_CRB_WIN_LOCK_ID, adapter->portnum);
         return 0;
 }
 
@@ -900,8 +893,7 @@ static void crb_win_unlock(struct netxen_adapter *adapter)
 {
         int val;
 
-        val = adapter->hw_read_wx(adapter,
-                        NETXEN_PCIE_REG(PCIE_SEM7_UNLOCK));
+        val = NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM7_UNLOCK));
 }
 
 /*
@@ -1037,8 +1029,7 @@ netxen_do_load_firmware(struct netxen_adapter *adapter, const char *fwname,
                 dev_info(&pdev->dev, "loading firmware from flash\n");
 
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
-                adapter->hw_write_wx(adapter,
-                                NETXEN_ROMUSB_GLB_CAS_RST, 1);
+                NXWR32(adapter, NETXEN_ROMUSB_GLB_CAS_RST, 1);
 
         if (fw) {
                 __le64 data;
@@ -1090,13 +1081,10 @@ netxen_do_load_firmware(struct netxen_adapter *adapter, const char *fwname,
         msleep(1);
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-                adapter->hw_write_wx(adapter,
-                                NETXEN_ROMUSB_GLB_SW_RESET, 0x80001d);
+                NXWR32(adapter, NETXEN_ROMUSB_GLB_SW_RESET, 0x80001d);
         else {
-                adapter->hw_write_wx(adapter,
-                                NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL, 0x3fff);
-                adapter->hw_write_wx(adapter,
-                                NETXEN_ROMUSB_GLB_CAS_RST, 0);
+                NXWR32(adapter, NETXEN_ROMUSB_GLB_CHIP_CLK_CTRL, 0x3fff);
+                NXWR32(adapter, NETXEN_ROMUSB_GLB_CAS_RST, 0);
         }
 
         return 0;
@@ -1154,8 +1142,7 @@ netxen_validate_firmware(struct netxen_adapter *adapter, const char *fwname,
         if (NETXEN_VERSION_CODE(major, minor, build) > ver)
                 return -EINVAL;
 
-        netxen_nic_reg_write(adapter, NETXEN_CAM_RAM(0x1fc),
-                        NETXEN_BDINFO_MAGIC);
+        NXWR32(adapter, NETXEN_CAM_RAM(0x1fc), NETXEN_BDINFO_MAGIC);
         return 0;
 }
 
@@ -1183,8 +1170,7 @@ request_mn:
         netxen_rom_fast_read(adapter,
                         NX_FW_VERSION_OFFSET, (int *)&flashed_ver);
         if (flashed_ver >= NETXEN_VERSION_CODE(4, 0, 220)) {
-                capability = adapter->hw_read_wx(adapter,
-                                NX_PEG_TUNE_CAPABILITY);
+                capability = NXRD32(adapter, NX_PEG_TUNE_CAPABILITY);
                 if (capability & NX_PEG_TUNE_MN_PRESENT) {
                         fw_type = NX_P3_MN_ROMIMAGE;
                         goto request_fw;
@@ -1332,38 +1318,6 @@ netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter, ulong off)
         return data;
 }
 
-void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val)
-{
-        adapter->hw_write_wx(adapter, off, val);
-}
-
-int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off)
-{
-        return adapter->hw_read_wx(adapter, off);
-}
-
-/* Change the window to 0, write and change back to window 1. */
-void netxen_nic_write_w0(struct netxen_adapter *adapter, u32 index, u32 value)
-{
-        adapter->hw_write_wx(adapter, index, value);
-}
-
-/* Change the window to 0, read and change back to window 1. */
-u32 netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index)
-{
-        return adapter->hw_read_wx(adapter, index);
-}
-
-void netxen_nic_write_w1(struct netxen_adapter *adapter, u32 index, u32 value)
-{
-        adapter->hw_write_wx(adapter, index, value);
-}
-
-u32 netxen_nic_read_w1(struct netxen_adapter *adapter, u32 index)
-{
-        return adapter->hw_read_wx(adapter, index);
-}
-
 /*
  * check memory access boundary.
  * used by test agent. support ddr access only for now
@@ -1475,10 +1429,9 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                 /* DDR network side */
                 window = MN_WIN(addr);
                 adapter->ahw.ddr_mn_window = window;
-                adapter->hw_write_wx(adapter,
-                                adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
+                NXWR32(adapter, adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
                                 window);
-                win_read = adapter->hw_read_wx(adapter,
+                win_read = NXRD32(adapter,
                                 adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE);
                 if ((win_read << 17) != window) {
                         printk(KERN_INFO "Written MNwin (0x%x) != "
@@ -1494,10 +1447,9 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
 
                 window = OCM_WIN(addr);
                 adapter->ahw.ddr_mn_window = window;
-                adapter->hw_write_wx(adapter,
-                                adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
+                NXWR32(adapter, adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE,
                                 window);
-                win_read = adapter->hw_read_wx(adapter,
+                win_read = NXRD32(adapter,
                                 adapter->ahw.mn_win_crb | NETXEN_PCI_CRBSPACE);
                 if ((win_read >> 7) != window) {
                         printk(KERN_INFO "%s: Written OCMwin (0x%x) != "
@@ -1511,10 +1463,9 @@ netxen_nic_pci_set_window_2M(struct netxen_adapter *adapter,
                 /* QDR network side */
                 window = MS_WIN(addr);
                 adapter->ahw.qdr_sn_window = window;
-                adapter->hw_write_wx(adapter,
-                                adapter->ahw.ms_win_crb | NETXEN_PCI_CRBSPACE,
+                NXWR32(adapter, adapter->ahw.ms_win_crb | NETXEN_PCI_CRBSPACE,
                                 window);
-                win_read = adapter->hw_read_wx(adapter,
+                win_read = NXRD32(adapter,
                                 adapter->ahw.ms_win_crb | NETXEN_PCI_CRBSPACE);
                 if (win_read != window) {
                         printk(KERN_INFO "%s: Written MSwin (0x%x) != "
@@ -1961,27 +1912,20 @@ netxen_nic_pci_mem_write_2M(struct netxen_adapter *adapter,
 
         for (i = 0; i < loop; i++) {
                 temp = off8 + (i << 3);
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_ADDR_LO, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_ADDR_LO, temp);
                 temp = 0;
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_ADDR_HI, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_ADDR_HI, temp);
                 temp = word[i] & 0xffffffff;
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_WRDATA_LO, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_WRDATA_LO, temp);
                 temp = (word[i] >> 32) & 0xffffffff;
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_WRDATA_HI, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_WRDATA_HI, temp);
                 temp = MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE;
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_CTRL, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_CTRL, temp);
                 temp = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE | MIU_TA_CTL_WRITE;
-                adapter->hw_write_wx(adapter,
-                                mem_crb+MIU_TEST_AGT_CTRL, temp);
+                NXWR32(adapter, mem_crb+MIU_TEST_AGT_CTRL, temp);
 
                 for (j = 0; j < MAX_CTL_CHECK; j++) {
-                        temp = adapter->hw_read_wx(adapter,
-                                        mem_crb + MIU_TEST_AGT_CTRL);
+                        temp = NXRD32(adapter, mem_crb + MIU_TEST_AGT_CTRL);
                         if ((temp & MIU_TA_CTL_BUSY) == 0)
                                 break;
                 }
@@ -2038,21 +1982,16 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
 
         for (i = 0; i < loop; i++) {
                 temp = off8 + (i << 3);
-                adapter->hw_write_wx(adapter,
-                                mem_crb + MIU_TEST_AGT_ADDR_LO, temp);
+                NXWR32(adapter, mem_crb + MIU_TEST_AGT_ADDR_LO, temp);
                 temp = 0;
-                adapter->hw_write_wx(adapter,
-                                mem_crb + MIU_TEST_AGT_ADDR_HI, temp);
+                NXWR32(adapter, mem_crb + MIU_TEST_AGT_ADDR_HI, temp);
                 temp = MIU_TA_CTL_ENABLE;
-                adapter->hw_write_wx(adapter,
-                                mem_crb + MIU_TEST_AGT_CTRL, temp);
+                NXWR32(adapter, mem_crb + MIU_TEST_AGT_CTRL, temp);
                 temp = MIU_TA_CTL_START | MIU_TA_CTL_ENABLE;
-                adapter->hw_write_wx(adapter,
-                                mem_crb + MIU_TEST_AGT_CTRL, temp);
+                NXWR32(adapter, mem_crb + MIU_TEST_AGT_CTRL, temp);
 
                 for (j = 0; j < MAX_CTL_CHECK; j++) {
-                        temp = adapter->hw_read_wx(adapter,
-                                        mem_crb + MIU_TEST_AGT_CTRL);
+                        temp = NXRD32(adapter, mem_crb + MIU_TEST_AGT_CTRL);
                         if ((temp & MIU_TA_CTL_BUSY) == 0)
                                 break;
                 }
@@ -2067,7 +2006,7 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
                 start = off0[i] >> 2;
                 end   = (off0[i] + sz[i] - 1) >> 2;
                 for (k = start; k <= end; k++) {
-                        temp = adapter->hw_read_wx(adapter,
+                        temp = NXRD32(adapter,
                                 mem_crb + MIU_TEST_AGT_RDDATA(k));
                         word[i] |= ((uint64_t)temp << (32 * k));
                 }
@@ -2111,14 +2050,14 @@ netxen_nic_pci_mem_read_2M(struct netxen_adapter *adapter,
 int netxen_nic_pci_write_immediate_2M(struct netxen_adapter *adapter,
                 u64 off, u32 data)
 {
-        adapter->hw_write_wx(adapter, off, data);
+        NXWR32(adapter, off, data);
 
         return 0;
 }
 
 u32 netxen_nic_pci_read_immediate_2M(struct netxen_adapter *adapter, u64 off)
 {
-        return adapter->hw_read_wx(adapter, off);
+        return NXRD32(adapter, off);
 }
 
 int netxen_nic_get_board_info(struct netxen_adapter *adapter)
@@ -2152,8 +2091,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
         adapter->ahw.board_type = board_type;
 
         if (board_type == NETXEN_BRDTYPE_P3_4_GB_MM) {
-                u32 gpio = netxen_nic_reg_read(adapter,
-                                NETXEN_ROMUSB_GLB_PAD_GPIO_I);
+                u32 gpio = NXRD32(adapter, NETXEN_ROMUSB_GLB_PAD_GPIO_I);
                 if ((gpio & 0x8000) == 0)
                         board_type = NETXEN_BRDTYPE_P3_10G_TP;
         }
@@ -2205,8 +2143,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)
 {
         new_mtu += MTU_FUDGE_FACTOR;
-        netxen_nic_write_w0(adapter,
-                NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port),
+        NXWR32(adapter, NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port),
                 new_mtu);
         return 0;
 }
@@ -2215,21 +2152,12 @@ int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
 {
         new_mtu += MTU_FUDGE_FACTOR;
         if (adapter->physical_port == 0)
-                netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE,
-                                new_mtu);
+                NXWR32(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);
         else
-                netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE,
-                                new_mtu);
+                NXWR32(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);
         return 0;
 }
 
-void
-netxen_crb_writelit_adapter(struct netxen_adapter *adapter,
-                unsigned long off, int data)
-{
-        adapter->hw_write_wx(adapter, off, data);
-}
-
 void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
 {
         __u32 status;
@@ -2244,8 +2172,7 @@ void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
         }
 
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                port_mode = adapter->hw_read_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR);
+                port_mode = NXRD32(adapter, NETXEN_PORT_MODE_ADDR);
                 if (port_mode == NETXEN_PORT_MODE_802_3_AP) {
                         adapter->link_speed   = SPEED_1000;
                         adapter->link_duplex  = DUPLEX_FULL;
@@ -2322,9 +2249,9 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter)
                 addr += sizeof(u32);
         }
 
-        fw_major = adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_MAJOR);
-        fw_minor = adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_MINOR);
-        fw_build = adapter->hw_read_wx(adapter, NETXEN_FW_VERSION_SUB);
+        fw_major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);
+        fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
+        fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
 
         adapter->fw_major = fw_major;
         adapter->fw_version = NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build);
@@ -2347,7 +2274,7 @@ void netxen_nic_get_firmware_info(struct netxen_adapter *adapter)
                         fw_major, fw_minor, fw_build);
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
-                i = adapter->hw_read_wx(adapter, NETXEN_MIU_MN_CONTROL);
+                i = NXRD32(adapter, NETXEN_MIU_MN_CONTROL);
                 adapter->ahw.cut_through = (i & 0x4) ? 1 : 0;
                 dev_info(&pdev->dev, "firmware running in %s mode\n",
                 adapter->ahw.cut_through ? "cut-through" : "legacy");
@@ -2362,9 +2289,9 @@ netxen_nic_wol_supported(struct netxen_adapter *adapter)
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return 0;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG_NV);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG_NV);
         if (wol_cfg & (1UL << adapter->portnum)) {
-                wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG);
+                wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
                 if (wol_cfg & (1 << adapter->portnum))
                         return 1;
         }