netxen: annotate register access functions

o remove unnecessary length parameter since register access
  width is fixed 4 byte.
o remove superfluous pci_read_normalize and pci_write_normalize
  functions.

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

1 files changed, 30 insertions, 36 deletions

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index cbd47ae694ba..31966a044900 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -109,7 +109,7 @@ void
 netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
                 struct nx_host_tx_ring *tx_ring, u32 producer)
 {
-        adapter->pci_write_normalize(adapter,
+        adapter->hw_write_wx(adapter,
                         tx_ring->crb_cmd_producer, producer);
 }
 
@@ -122,7 +122,7 @@ static inline void
 netxen_nic_update_cmd_consumer(struct netxen_adapter *adapter,
                 struct nx_host_tx_ring *tx_ring, u32 consumer)
 {
-        adapter->pci_write_normalize(adapter,
+        adapter->hw_write_wx(adapter,
                         tx_ring->crb_cmd_consumer, consumer);
 }
 
@@ -139,14 +139,14 @@ static inline void netxen_nic_disable_int(struct nx_host_sds_ring *sds_ring)
 {
         struct netxen_adapter *adapter = sds_ring->adapter;
 
-        adapter->pci_write_normalize(adapter, sds_ring->crb_intr_mask, 0);
+        adapter->hw_write_wx(adapter, sds_ring->crb_intr_mask, 0);
 }
 
 static inline void netxen_nic_enable_int(struct nx_host_sds_ring *sds_ring)
 {
         struct netxen_adapter *adapter = sds_ring->adapter;
 
-        adapter->pci_write_normalize(adapter, sds_ring->crb_intr_mask, 0x1);
+        adapter->hw_write_wx(adapter, sds_ring->crb_intr_mask, 0x1);
 
         if (!NETXEN_IS_MSI_FAMILY(adapter))
                 adapter->pci_write_immediate(adapter,
@@ -309,42 +309,41 @@ netxen_check_hw_init(struct netxen_adapter *adapter, int first_boot)
 
         if (first_boot == 0x55555555) {
                 /* This is the first boot after power up */
-                adapter->pci_write_normalize(adapter,
+                adapter->hw_write_wx(adapter,
                         NETXEN_CAM_RAM(0x1fc), NETXEN_BDINFO_MAGIC);
 
                 if (!NX_IS_REVISION_P2(adapter->ahw.revision_id))
                         return 0;
 
                 /* PCI bus master workaround */
-                adapter->hw_read_wx(adapter,
-                        NETXEN_PCIE_REG(0x4), &first_boot, 4);
+                first_boot = adapter->hw_read_wx(adapter, NETXEN_PCIE_REG(0x4));
                 if (!(first_boot & 0x4)) {
                         first_boot |= 0x4;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PCIE_REG(0x4), &first_boot, 4);
-                        adapter->hw_read_wx(adapter,
-                                NETXEN_PCIE_REG(0x4), &first_boot, 4);
+                                NETXEN_PCIE_REG(0x4), first_boot);
+                        first_boot = adapter->hw_read_wx(adapter,
+                                NETXEN_PCIE_REG(0x4));
                 }
 
                 /* This is the first boot after power up */
-                adapter->hw_read_wx(adapter,
-                        NETXEN_ROMUSB_GLB_SW_RESET, &first_boot, 4);
+                first_boot = adapter->hw_read_wx(adapter,
+                        NETXEN_ROMUSB_GLB_SW_RESET);
                 if (first_boot != 0x80000f) {
                         /* clear the register for future unloads/loads */
-                        adapter->pci_write_normalize(adapter,
+                        adapter->hw_write_wx(adapter,
                                         NETXEN_CAM_RAM(0x1fc), 0);
                         return -EIO;
                 }
 
                 /* Start P2 boot loader */
-                val = adapter->pci_read_normalize(adapter,
+                val = adapter->hw_read_wx(adapter,
                                 NETXEN_ROMUSB_GLB_PEGTUNE_DONE);
-                adapter->pci_write_normalize(adapter,
+                adapter->hw_write_wx(adapter,
                                 NETXEN_ROMUSB_GLB_PEGTUNE_DONE, val | 0x1);
                 timeout = 0;
                 do {
                         msleep(1);
-                        val = adapter->pci_read_normalize(adapter,
+                        val = adapter->hw_read_wx(adapter,
                                         NETXEN_CAM_RAM(0x1fc));
 
                         if (++timeout > 5000)
@@ -365,23 +364,23 @@ static void netxen_set_port_mode(struct netxen_adapter *adapter)
                 if (port_mode == NETXEN_PORT_MODE_802_3_AP) {
                         data = NETXEN_PORT_MODE_802_3_AP;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR, &data, 4);
+                                NETXEN_PORT_MODE_ADDR, data);
                 } else if (port_mode == NETXEN_PORT_MODE_XG) {
                         data = NETXEN_PORT_MODE_XG;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR, &data, 4);
+                                NETXEN_PORT_MODE_ADDR, data);
                 } else if (port_mode == NETXEN_PORT_MODE_AUTO_NEG_1G) {
                         data = NETXEN_PORT_MODE_AUTO_NEG_1G;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR, &data, 4);
+                                NETXEN_PORT_MODE_ADDR, data);
                 } else if (port_mode == NETXEN_PORT_MODE_AUTO_NEG_XG) {
                         data = NETXEN_PORT_MODE_AUTO_NEG_XG;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR, &data, 4);
+                                NETXEN_PORT_MODE_ADDR, data);
                 } else {
                         data = NETXEN_PORT_MODE_AUTO_NEG;
                         adapter->hw_write_wx(adapter,
-                                NETXEN_PORT_MODE_ADDR, &data, 4);
+                                NETXEN_PORT_MODE_ADDR, data);
                 }
 
                 if ((wol_port_mode != NETXEN_PORT_MODE_802_3_AP) &&
@@ -391,7 +390,7 @@ static void netxen_set_port_mode(struct netxen_adapter *adapter)
                         wol_port_mode = NETXEN_PORT_MODE_AUTO_NEG;
                 }
                 adapter->hw_write_wx(adapter, NETXEN_WOL_PORT_MODE,
-                        &wol_port_mode, 4);
+                        wol_port_mode);
         }
 }
 
@@ -572,8 +571,6 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)
         adapter->hw_read_wx = netxen_nic_hw_read_wx_128M;
         adapter->pci_read_immediate = netxen_nic_pci_read_immediate_128M;
         adapter->pci_write_immediate = netxen_nic_pci_write_immediate_128M;
-        adapter->pci_read_normalize = netxen_nic_pci_read_normalize_128M;
-        adapter->pci_write_normalize = netxen_nic_pci_write_normalize_128M;
         adapter->pci_set_window = netxen_nic_pci_set_window_128M;
         adapter->pci_mem_read = netxen_nic_pci_mem_read_128M;
         adapter->pci_mem_write = netxen_nic_pci_mem_write_128M;
@@ -595,9 +592,6 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)
                 adapter->pci_read_immediate = netxen_nic_pci_read_immediate_2M;
                 adapter->pci_write_immediate =
                         netxen_nic_pci_write_immediate_2M;
-                adapter->pci_read_normalize = netxen_nic_pci_read_normalize_2M;
-                adapter->pci_write_normalize =
-                        netxen_nic_pci_write_normalize_2M;
                 adapter->pci_set_window = netxen_nic_pci_set_window_2M;
                 adapter->pci_mem_read = netxen_nic_pci_mem_read_2M;
                 adapter->pci_mem_write = netxen_nic_pci_mem_write_2M;
@@ -680,7 +674,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
         if (!first_driver)
                 return 0;
 
-        first_boot = adapter->pci_read_normalize(adapter,
+        first_boot = adapter->hw_read_wx(adapter,
                         NETXEN_CAM_RAM(0x1fc));
 
         err = netxen_check_hw_init(adapter, first_boot);
@@ -690,7 +684,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
         }
 
         if (first_boot != 0x55555555) {
-                adapter->pci_write_normalize(adapter,
+                adapter->hw_write_wx(adapter,
                                         CRB_CMDPEG_STATE, 0);
                 netxen_pinit_from_rom(adapter, 0);
                 msleep(1);
@@ -723,7 +717,7 @@ netxen_start_firmware(struct netxen_adapter *adapter)
         val = (_NETXEN_NIC_LINUX_MAJOR << 16)
                 | ((_NETXEN_NIC_LINUX_MINOR << 8))
                 | (_NETXEN_NIC_LINUX_SUBVERSION);
-        adapter->pci_write_normalize(adapter, CRB_DRIVER_VERSION, val);
+        adapter->hw_write_wx(adapter, CRB_DRIVER_VERSION, val);
 
         /* Handshake with the card before we register the devices. */
         err = netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
@@ -1038,7 +1032,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
          */
         adapter->physical_port = adapter->portnum;
         if (adapter->fw_major < 4) {
-                i = adapter->pci_read_normalize(adapter,
+                i = adapter->hw_read_wx(adapter,
                                 CRB_V2P(adapter->portnum));
                 if (i != 0x55555555)
                         adapter->physical_port = i;
@@ -1486,7 +1480,7 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter)
         uint32_t temp, temp_state, temp_val;
         int rv = 0;
 
-        temp = adapter->pci_read_normalize(adapter, CRB_TEMP_STATE);
+        temp = adapter->hw_read_wx(adapter, CRB_TEMP_STATE);
 
         temp_state = nx_get_temp_state(temp);
         temp_val = nx_get_temp_val(temp);
@@ -1557,11 +1551,11 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)
         port = adapter->physical_port;
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
-                val = adapter->pci_read_normalize(adapter, CRB_XG_STATE_P3);
+                val = adapter->hw_read_wx(adapter, CRB_XG_STATE_P3);
                 val = XG_LINK_STATE_P3(adapter->ahw.pci_func, val);
                 linkup = (val == XG_LINK_UP_P3);
         } else {
-                val = adapter->pci_read_normalize(adapter, CRB_XG_STATE);
+                val = adapter->hw_read_wx(adapter, CRB_XG_STATE);
                 if (adapter->ahw.port_type == NETXEN_NIC_GBE)
                         linkup = (val >> port) & 1;
                 else {
@@ -1656,14 +1650,14 @@ static irqreturn_t netxen_intr(int irq, void *data)
         } else {
                 unsigned long our_int = 0;
 
-                our_int = adapter->pci_read_normalize(adapter, CRB_INT_VECTOR);
+                our_int = adapter->hw_read_wx(adapter, CRB_INT_VECTOR);
 
                 /* not our interrupt */
                 if (!test_and_clear_bit((7 + adapter->portnum), &our_int))
                         return IRQ_NONE;
 
                 /* claim interrupt */
-                adapter->pci_write_normalize(adapter,
+                adapter->hw_write_wx(adapter,
                                 CRB_INT_VECTOR, (our_int & 0xffffffff));
         }