diff options
author | Mithlesh Thukral <mithlesh@netxen.com> | 2007-04-20 10:53:05 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:01:05 -0400 |
commit | 13ba9c7714cfa40821d29090442de14d01d6eb33 (patch) | |
tree | 3e588342e36e85fb557c46e18efabbac6c69f80c /drivers/net/netxen/netxen_nic_ethtool.c | |
parent | 3176ff3ee71bddbd1d68e6a9e28dbcf0a2960c95 (diff) |
NetXen: Removal of redundant argument passing
NetXen: Removal of redundant function call parameters and bug fixes.
This patch will remove the redundant paramters which were being passed to
many functions since now adapter->portnum can be used.
Signed-off-by: Mithlesh Thukral <mithlesh@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_ethtool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index c400f264ea43..24c68f42584d 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c | |||
@@ -211,7 +211,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
211 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { | 211 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { |
212 | /* autonegotiation */ | 212 | /* autonegotiation */ |
213 | if (adapter->phy_write | 213 | if (adapter->phy_write |
214 | && adapter->phy_write(adapter, adapter->portnum, | 214 | && adapter->phy_write(adapter, |
215 | NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG, | 215 | NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG, |
216 | ecmd->autoneg) != 0) | 216 | ecmd->autoneg) != 0) |
217 | return -EIO; | 217 | return -EIO; |
@@ -219,7 +219,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
219 | adapter->link_autoneg = ecmd->autoneg; | 219 | adapter->link_autoneg = ecmd->autoneg; |
220 | 220 | ||
221 | if (adapter->phy_read | 221 | if (adapter->phy_read |
222 | && adapter->phy_read(adapter, adapter->portnum, | 222 | && adapter->phy_read(adapter, |
223 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, | 223 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, |
224 | &status) != 0) | 224 | &status) != 0) |
225 | return -EIO; | 225 | return -EIO; |
@@ -242,7 +242,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
242 | if (ecmd->duplex == DUPLEX_FULL) | 242 | if (ecmd->duplex == DUPLEX_FULL) |
243 | netxen_set_phy_duplex(status); | 243 | netxen_set_phy_duplex(status); |
244 | if (adapter->phy_write | 244 | if (adapter->phy_write |
245 | && adapter->phy_write(adapter, adapter->portnum, | 245 | && adapter->phy_write(adapter, |
246 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, | 246 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, |
247 | *((int *)&status)) != 0) | 247 | *((int *)&status)) != 0) |
248 | return -EIO; | 248 | return -EIO; |
@@ -399,7 +399,7 @@ static u32 netxen_nic_test_link(struct net_device *dev) | |||
399 | /* read which mode */ | 399 | /* read which mode */ |
400 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { | 400 | if (adapter->ahw.board_type == NETXEN_NIC_GBE) { |
401 | if (adapter->phy_read | 401 | if (adapter->phy_read |
402 | && adapter->phy_read(adapter, adapter->portnum, | 402 | && adapter->phy_read(adapter, |
403 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, | 403 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, |
404 | &status) != 0) | 404 | &status) != 0) |
405 | return -EIO; | 405 | return -EIO; |
@@ -579,7 +579,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, | |||
579 | /* set autoneg */ | 579 | /* set autoneg */ |
580 | autoneg = pause->autoneg; | 580 | autoneg = pause->autoneg; |
581 | if (adapter->phy_write | 581 | if (adapter->phy_write |
582 | && adapter->phy_write(adapter, adapter->portnum, | 582 | && adapter->phy_write(adapter, |
583 | NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG, | 583 | NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG, |
584 | autoneg) != 0) | 584 | autoneg) != 0) |
585 | return -EIO; | 585 | return -EIO; |