aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-08-26 02:11:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-29 15:30:29 -0400
commit83ed90155f98bd949735c2cc22d832b557a6d7d1 (patch)
tree795ecd1ebd93357a80895825310c19315a633e49 /drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
parenta72b8b088c3465b28192c1a14ba97be8223a8cec (diff)
iwlagn: all function iwl-io.c receive iwl_bus
Which means that iwl-io.c doesn't need to include iwl-dev.h any more. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h b/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
index b77b0f79fcb0..bd6e64026a06 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-int-pcie.h
@@ -200,12 +200,12 @@ static inline void iwl_disable_interrupts(struct iwl_trans *trans)
200 clear_bit(STATUS_INT_ENABLED, &trans->shrd->status); 200 clear_bit(STATUS_INT_ENABLED, &trans->shrd->status);
201 201
202 /* disable interrupts from uCode/NIC to host */ 202 /* disable interrupts from uCode/NIC to host */
203 iwl_write32(priv(trans), CSR_INT_MASK, 0x00000000); 203 iwl_write32(bus(trans), CSR_INT_MASK, 0x00000000);
204 204
205 /* acknowledge/clear/reset any interrupts still pending 205 /* acknowledge/clear/reset any interrupts still pending
206 * from uCode or flow handler (Rx/Tx DMA) */ 206 * from uCode or flow handler (Rx/Tx DMA) */
207 iwl_write32(priv(trans), CSR_INT, 0xffffffff); 207 iwl_write32(bus(trans), CSR_INT, 0xffffffff);
208 iwl_write32(priv(trans), CSR_FH_INT_STATUS, 0xffffffff); 208 iwl_write32(bus(trans), CSR_FH_INT_STATUS, 0xffffffff);
209 IWL_DEBUG_ISR(trans, "Disabled interrupts\n"); 209 IWL_DEBUG_ISR(trans, "Disabled interrupts\n");
210} 210}
211 211
@@ -216,7 +216,7 @@ static inline void iwl_enable_interrupts(struct iwl_trans *trans)
216 216
217 IWL_DEBUG_ISR(trans, "Enabling interrupts\n"); 217 IWL_DEBUG_ISR(trans, "Enabling interrupts\n");
218 set_bit(STATUS_INT_ENABLED, &trans->shrd->status); 218 set_bit(STATUS_INT_ENABLED, &trans->shrd->status);
219 iwl_write32(priv(trans), CSR_INT_MASK, trans_pcie->inta_mask); 219 iwl_write32(bus(trans), CSR_INT_MASK, trans_pcie->inta_mask);
220} 220}
221 221
222#endif /* __iwl_trans_int_pcie_h__ */ 222#endif /* __iwl_trans_int_pcie_h__ */