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, 26 insertions, 33 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 6c5a111e80b..a452b2facb7 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -92,12 +92,9 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         strncpy(drvinfo->driver, netxen_nic_driver_name, 32);
         strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);
         write_lock_irqsave(&adapter->adapter_lock, flags);
-        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);
         write_unlock_irqrestore(&adapter->adapter_lock, flags);
         sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
 
@@ -135,7 +132,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
                 u32 val;
 
-                val = adapter->hw_read_wx(adapter, NETXEN_PORT_MODE_ADDR);
+                val = NXRD32(adapter, NETXEN_PORT_MODE_ADDR);
                 if (val == NETXEN_PORT_MODE_802_3_AP) {
                         ecmd->supported = SUPPORTED_1000baseT_Full;
                         ecmd->advertising = ADVERTISED_1000baseT_Full;
@@ -156,8 +153,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
                         u16 pcifn = adapter->ahw.pci_func;
 
-                        val = adapter->hw_read_wx(adapter,
-                                P3_LINK_SPEED_REG(pcifn));
+                        val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn));
                         ecmd->speed = P3_LINK_SPEED_MHZ *
                                         P3_LINK_SPEED_VAL(pcifn, val);
                 } else
@@ -423,12 +419,11 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
         regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
             (adapter->pdev)->device;
         /* which mode */
-        regs_buff[0] = adapter->hw_read_wx(adapter, NETXEN_NIU_MODE);
+        regs_buff[0] = NXRD32(adapter, NETXEN_NIU_MODE);
         mode = regs_buff[0];
 
         /* Common registers to all the modes */
-        regs_buff[2] = adapter->hw_read_wx(adapter,
-                        NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);
+        regs_buff[2] = NXRD32(adapter, NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);
         /* GB/XGB Mode */
         mode = (mode / 2) - 1;
         window = 0;
@@ -439,7 +434,7 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
                                 window = adapter->physical_port *
                                         NETXEN_NIC_PORT_WINDOW;
 
-                        regs_buff[i] = adapter->hw_read_wx(adapter,
+                        regs_buff[i] = NXRD32(adapter,
                                 niu_registers[mode].reg[i - 3] + window);
                 }
 
@@ -464,7 +459,7 @@ static u32 netxen_nic_test_link(struct net_device *dev)
                         return !val;
                 }
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
-                val = adapter->hw_read_wx(adapter, CRB_XG_STATE);
+                val = NXRD32(adapter, CRB_XG_STATE);
                 return (val == XG_LINK_UP) ? 0 : 1;
         }
         return -EIO;
@@ -528,10 +523,9 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                         return;
                 /* get flow control settings */
-                val = netxen_nic_read_w0(adapter,
-                                NETXEN_NIU_GB_MAC_CONFIG_0(port));
+                val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
                 pause->rx_pause = netxen_gb_get_rx_flowctl(val);
-                val = netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL);
+                val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL);
                 switch (port) {
                         case 0:
                                 pause->tx_pause = !(netxen_gb_get_gb0_mask(val));
@@ -551,7 +545,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                         return;
                 pause->rx_pause = 1;
-                val = netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL);
+                val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
                 if (port == 0)
                         pause->tx_pause = !(netxen_xg_get_xg0_mask(val));
                 else
@@ -574,18 +568,17 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                         return -EIO;
                 /* set flow control */
-                val = netxen_nic_read_w0(adapter,
-                                        NETXEN_NIU_GB_MAC_CONFIG_0(port));
+                val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
 
                 if (pause->rx_pause)
                         netxen_gb_rx_flowctl(val);
                 else
                         netxen_gb_unset_rx_flowctl(val);
 
-                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
+                NXWR32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
                                 val);
                 /* set autoneg */
-                val = netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL);
+                val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL);
                 switch (port) {
                         case 0:
                                 if (pause->tx_pause)
@@ -613,11 +606,11 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                                         netxen_gb_set_gb3_mask(val);
                                 break;
                 }
-                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
+                NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
                 if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                         return -EIO;
-                val = netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL);
+                val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
                 if (port == 0) {
                         if (pause->tx_pause)
                                 netxen_xg_unset_xg0_mask(val);
@@ -629,7 +622,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                         else
                                 netxen_xg_set_xg1_mask(val);
                 }
-                netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
+                NXWR32(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
         } else {
                 printk(KERN_ERR "%s: Unknown board type: %x\n",
                                 netxen_nic_driver_name,
@@ -643,14 +636,14 @@ static int netxen_nic_reg_test(struct net_device *dev)
         struct netxen_adapter *adapter = netdev_priv(dev);
         u32 data_read, data_written;
 
-        data_read = netxen_nic_read_w0(adapter, NETXEN_PCIX_PH_REG(0));
+        data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0));
         if ((data_read & 0xffff) != PHAN_VENDOR_ID)
         return 1;
 
         data_written = (u32)0xa5a5a5a5;
 
-        netxen_nic_reg_write(adapter, CRB_SCRATCHPAD_TEST, data_written);
-        data_read = adapter->hw_read_wx(adapter, CRB_SCRATCHPAD_TEST);
+        NXWR32(adapter, CRB_SCRATCHPAD_TEST, data_written);
+        data_read = NXRD32(adapter, CRB_SCRATCHPAD_TEST);
         if (data_written != data_read)
                 return 1;
 
@@ -767,11 +760,11 @@ netxen_nic_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return;
 
-        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->supported |= WAKE_MAGIC;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
         if (wol_cfg & (1UL << adapter->portnum))
                 wol->wolopts |= WAKE_MAGIC;
 }
@@ -788,16 +781,16 @@ netxen_nic_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EOPNOTSUPP;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG_NV);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG_NV);
         if (!(wol_cfg & (1 << adapter->portnum)))
                 return -EOPNOTSUPP;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
         if (wol->wolopts & WAKE_MAGIC)
                 wol_cfg |= 1UL << adapter->portnum;
         else
                 wol_cfg &= ~(1UL << adapter->portnum);
-        netxen_nic_reg_write(adapter, NETXEN_WOL_CONFIG, wol_cfg);
+        NXWR32(adapter, NETXEN_WOL_CONFIG, wol_cfg);
 
         return 0;
 }