diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-12-09 02:47:46 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-12-17 15:32:58 -0500 |
commit | eef31718ebfa6b56f9d32ff25110ede982abecdc (patch) | |
tree | accbbfc7e84a291f7724ecb40ea09b191bd4a32d /drivers/net/wireless/iwlwifi/iwl-csr.h | |
parent | cf4ef65446443eb485afe9419ea82b2efbe582a7 (diff) |
iwlwifi: pcie: clean up ICT allocation code
Since iwl_trans_pcie_alloc_ict is called in the PCIe
allocation code, we always set CSR_INT_BIT_RX_PERIODIC.
Move that bit to the default list of interrupts we enable
and simplify the code.
Also use dma_zalloc_ and avoid to memset the memory
afterwards.
trans_pcie->ict_index is 0 since trans_pcie has just been
kzalloced, remove the redundant assignment.
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-csr.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-csr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h index da4eca8b3007..bbab26e937c6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/drivers/net/wireless/iwlwifi/iwl-csr.h | |||
@@ -198,7 +198,8 @@ | |||
198 | CSR_INT_BIT_RF_KILL | \ | 198 | CSR_INT_BIT_RF_KILL | \ |
199 | CSR_INT_BIT_SW_RX | \ | 199 | CSR_INT_BIT_SW_RX | \ |
200 | CSR_INT_BIT_WAKEUP | \ | 200 | CSR_INT_BIT_WAKEUP | \ |
201 | CSR_INT_BIT_ALIVE) | 201 | CSR_INT_BIT_ALIVE | \ |
202 | CSR_INT_BIT_RX_PERIODIC) | ||
202 | 203 | ||
203 | /* interrupt flags in FH (flow handler) (PCI busmaster DMA) */ | 204 | /* interrupt flags in FH (flow handler) (PCI busmaster DMA) */ |
204 | #define CSR_FH_INT_BIT_ERR (1 << 31) /* Error */ | 205 | #define CSR_FH_INT_BIT_ERR (1 << 31) /* Error */ |