NetXen: Removal of redundant argument passing

[cascardo/linux.git] / drivers / net / netxen / netxen_nic_ethtool.c

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 986ef98..24c68f4 100644 (file)
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -50,8 +50,8 @@ struct netxen_nic_stats {
        int stat_offset;
 };
 
-#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_port *)0)->m), \
-                       offsetof(struct netxen_port, m)
+#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_adapter *)0)->m), \
+                       offsetof(struct netxen_adapter, m)
 
 #define NETXEN_NIC_PORT_WINDOW 0x10000
 #define NETXEN_NIC_INVALID_DATA 0xDEADBEEF
@@ -100,8 +100,7 @@ static int netxen_nic_get_eeprom_len(struct net_device *dev)
 static void
 netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        u32 fw_major = 0;
        u32 fw_minor = 0;
        u32 fw_build = 0;
@@ -115,7 +114,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
        fw_build = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB));
        sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
 
-       strncpy(drvinfo->bus_info, pci_name(port->pdev), 32);
+       strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
        drvinfo->n_stats = NETXEN_NIC_STATS_LEN;
        drvinfo->testinfo_len = NETXEN_NIC_TEST_LEN;
        drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;
@@ -125,8 +124,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
 static int
 netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;
 
        /* read which mode */
@@ -146,8 +144,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                ecmd->port = PORT_TP;
 
                if (netif_running(dev)) {
-                       ecmd->speed = port->link_speed;
-                       ecmd->duplex = port->link_duplex;
+                       ecmd->speed = adapter->link_speed;
+                       ecmd->duplex = adapter->link_duplex;
                } else
                        return -EIO;    /* link absent */
        } else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
@@ -165,7 +163,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
        } else
                return -EIO;
 
-       ecmd->phy_address = port->portnum;
+       ecmd->phy_address = adapter->portnum;
        ecmd->transceiver = XCVR_EXTERNAL;
 
        switch ((netxen_brdtype_t) boardinfo->board_type) {
@@ -179,7 +177,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                ecmd->port = PORT_TP;
                ecmd->autoneg = (boardinfo->board_type ==
                                 NETXEN_BRDTYPE_P2_SB31_10G_CX4) ?
-                   (AUTONEG_DISABLE) : (port->link_autoneg);
+                   (AUTONEG_DISABLE) : (adapter->link_autoneg);
                break;
        case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ:
        case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:
@@ -206,23 +204,22 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 static int
 netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 status;
 
        /* read which mode */
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                /* autonegotiation */
                if (adapter->phy_write
-                   && adapter->phy_write(adapter, port->portnum,
+                   && adapter->phy_write(adapter,
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
                                          ecmd->autoneg) != 0)
                        return -EIO;
                else
-                       port->link_autoneg = ecmd->autoneg;
+                       adapter->link_autoneg = ecmd->autoneg;
 
                if (adapter->phy_read
-                   && adapter->phy_read(adapter, port->portnum,
+                   && adapter->phy_read(adapter,
                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                         &status) != 0)
                        return -EIO;
@@ -245,13 +242,13 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                if (ecmd->duplex == DUPLEX_FULL)
                        netxen_set_phy_duplex(status);
                if (adapter->phy_write
-                   && adapter->phy_write(adapter, port->portnum,
+                   && adapter->phy_write(adapter,
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                          *((int *)&status)) != 0)
                        return -EIO;
                else {
-                       port->link_speed = ecmd->speed;
-                       port->link_duplex = ecmd->duplex;
+                       adapter->link_speed = ecmd->speed;
+                       adapter->link_duplex = ecmd->duplex;
                }
        } else
                return -EOPNOTSUPP;
@@ -360,15 +357,14 @@ static struct netxen_niu_regs niu_registers[] = {
 static void
 netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 mode, *regs_buff = p;
        void __iomem *addr;
        int i, window;
 
        memset(p, 0, NETXEN_NIC_REGS_LEN);
        regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
-           (port->pdev)->device;
+           (adapter->pdev)->device;
        /* which mode */
        NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_MODE, &regs_buff[0]);
        mode = regs_buff[0];
@@ -383,7 +379,8 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
                for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
                        /* GB: port specific registers */
                        if (mode == 0 && i >= 19)
-                               window = port->portnum * NETXEN_NIC_PORT_WINDOW;
+                               window = adapter->portnum * 
+                                       NETXEN_NIC_PORT_WINDOW;
 
                        NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].
                                                   reg[i - 3] + window,
@@ -395,15 +392,14 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
 
 static u32 netxen_nic_test_link(struct net_device *dev)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 status;
        int val;
 
        /* read which mode */
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                if (adapter->phy_read
-                   && adapter->phy_read(adapter, port->portnum,
+                   && adapter->phy_read(adapter,
                                         NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
                                         &status) != 0)
                        return -EIO;
@@ -422,15 +418,15 @@ static int
 netxen_nic_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                      u8 * bytes)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        int offset;
        int ret;
 
        if (eeprom->len == 0)
                return -EINVAL;
 
-       eeprom->magic = (port->pdev)->vendor | ((port->pdev)->device << 16);
+       eeprom->magic = (adapter->pdev)->vendor | 
+                       ((adapter->pdev)->device << 16);
        offset = eeprom->offset;
 
        ret = netxen_rom_fast_read_words(adapter, offset, bytes, 
@@ -445,8 +441,7 @@ static int
 netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                        u8 * bytes)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        int offset = eeprom->offset;
        static int flash_start;
        static int ready_to_flash;
@@ -462,6 +457,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
                }
                printk(KERN_INFO "%s: flash unlocked. \n", 
                        netxen_nic_driver_name);
+               last_schedule_time = jiffies;
                ret = netxen_flash_erase_secondary(adapter);
                if (ret != FLASH_SUCCESS) {
                        printk(KERN_ERR "%s: Flash erase failed.\n", 
@@ -515,8 +511,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
 static void
 netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        int i;
 
        ring->rx_pending = 0;
@@ -540,19 +535,18 @@ static void
 netxen_nic_get_pauseparam(struct net_device *dev,
                          struct ethtool_pauseparam *pause)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 val;
 
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                /* get flow control settings */
                netxen_nic_read_w0(adapter,
-                                  NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
+                                  NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
                                   &val);
                pause->rx_pause = netxen_gb_get_rx_flowctl(val);
                pause->tx_pause = netxen_gb_get_tx_flowctl(val);
                /* get autoneg settings */
-               pause->autoneg = port->link_autoneg;
+               pause->autoneg = adapter->link_autoneg;
        }
 }
 
@@ -560,8 +554,7 @@ static int
 netxen_nic_set_pauseparam(struct net_device *dev,
                          struct ethtool_pauseparam *pause)
 {
-       struct netxen_port *port = netdev_priv(dev);
-       struct netxen_adapter *adapter = port->adapter;
+       struct netxen_adapter *adapter = netdev_priv(dev);
        __u32 val;
        unsigned int autoneg;
 
@@ -569,7 +562,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
        if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
                /* set flow control */
                netxen_nic_read_w0(adapter,
-                                  NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
+                                  NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
                                   (u32 *) & val);
                if (pause->tx_pause)
                        netxen_gb_tx_flowctl(val);
@@ -581,17 +574,17 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                        netxen_gb_unset_rx_flowctl(val);
 
                netxen_nic_write_w0(adapter,
-                                   NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),
+                                   NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
                                    *&val);
                /* set autoneg */
                autoneg = pause->autoneg;
                if (adapter->phy_write
-                   && adapter->phy_write(adapter, port->portnum,
+                   && adapter->phy_write(adapter,
                                          NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
                                          autoneg) != 0)
                        return -EIO;
                else {
-                       port->link_autoneg = pause->autoneg;
+                       adapter->link_autoneg = pause->autoneg;
                        return 0;
                }
        } else
@@ -674,12 +667,13 @@ static void
 netxen_nic_get_ethtool_stats(struct net_device *dev,
                             struct ethtool_stats *stats, u64 * data)
 {
-       struct netxen_port *port = netdev_priv(dev);
+       struct netxen_adapter *adapter = netdev_priv(dev);
        int index;
 
        for (index = 0; index < NETXEN_NIC_STATS_LEN; index++) {
                char *p =
-                   (char *)port + netxen_nic_gstrings_stats[index].stat_offset;
+                   (char *)adapter +
+                   netxen_nic_gstrings_stats[index].stat_offset;
                data[index] =
                    (netxen_nic_gstrings_stats[index].sizeof_stat ==
                     sizeof(u64)) ? *(u64 *) p : *(u32 *) p;