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_isr.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_isr.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_isr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c index f60c96991913..8510216c6b02 100644 --- a/drivers/net/netxen/netxen_nic_isr.c +++ b/drivers/net/netxen/netxen_nic_isr.c | |||
@@ -82,7 +82,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable) | |||
82 | 82 | ||
83 | /* This should clear the interrupt source */ | 83 | /* This should clear the interrupt source */ |
84 | if (adapter->phy_read) | 84 | if (adapter->phy_read) |
85 | adapter->phy_read(adapter, adapter->portnum, | 85 | adapter->phy_read(adapter, |
86 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS, | 86 | NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS, |
87 | &int_src); | 87 | &int_src); |
88 | if (int_src == 0) { | 88 | if (int_src == 0) { |
@@ -90,7 +90,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable) | |||
90 | return; | 90 | return; |
91 | } | 91 | } |
92 | if (adapter->disable_phy_interrupts) | 92 | if (adapter->disable_phy_interrupts) |
93 | adapter->disable_phy_interrupts(adapter, adapter->portnum); | 93 | adapter->disable_phy_interrupts(adapter); |
94 | 94 | ||
95 | if (netxen_get_phy_int_jabber(int_src)) | 95 | if (netxen_get_phy_int_jabber(int_src)) |
96 | DPRINTK(INFO, "Jabber interrupt \n"); | 96 | DPRINTK(INFO, "Jabber interrupt \n"); |
@@ -111,7 +111,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable) | |||
111 | DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n"); | 111 | DPRINTK(INFO, "SPEED CHANGED OR LINK STATUS CHANGED \n"); |
112 | 112 | ||
113 | if (adapter->phy_read | 113 | if (adapter->phy_read |
114 | && adapter->phy_read(adapter, adapter->portnum, | 114 | && adapter->phy_read(adapter, |
115 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, | 115 | NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS, |
116 | &status) == 0) { | 116 | &status) == 0) { |
117 | if (netxen_get_phy_int_link_status_changed(int_src)) { | 117 | if (netxen_get_phy_int_link_status_changed(int_src)) { |
@@ -135,7 +135,7 @@ void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable) | |||
135 | } | 135 | } |
136 | } | 136 | } |
137 | if (adapter->enable_phy_interrupts) | 137 | if (adapter->enable_phy_interrupts) |
138 | adapter->enable_phy_interrupts(adapter, adapter->portnum); | 138 | adapter->enable_phy_interrupts(adapter); |
139 | } | 139 | } |
140 | 140 | ||
141 | void netxen_nic_isr_other(struct netxen_adapter *adapter) | 141 | void netxen_nic_isr_other(struct netxen_adapter *adapter) |
@@ -179,6 +179,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter) | |||
179 | 179 | ||
180 | /* WINDOW = 1 */ | 180 | /* WINDOW = 1 */ |
181 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); | 181 | val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE)); |
182 | val >>= (adapter->portnum * 8); | ||
182 | val1 = val & 0xff; | 183 | val1 = val & 0xff; |
183 | 184 | ||
184 | if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) { | 185 | if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) { |