evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlwifi: pcie: determine the interrupt type in the handler

Browse source 
Instead of having:
iwl_pcie_irq_handler
	iwl_pcie_isr_ict
		iwl_pcie_isr_non_ict

we now have:

iwl_pcie_irq_handler:
	if (use_ict))
		iwl_pcie_int_cause_ict;
	else
		iwl_pcie_int_cause_non_ict;

This is much clearer.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Emmanuel Grumbach 2013-12-11 09:02:25 +02:00
parent a0f337cc35
commit 0fec954249
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/wireless/iwlwifi/pcie/rx.c
View file

@ -807,8 +807,7 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)
wake_up(&trans_pcie->wait_command_queue); wake_up(&trans_pcie->wait_command_queue);
} }
/* legacy (non-ICT) ISR. Assumes that trans_pcie->irq_lock is held */ static irqreturn_t iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
static irqreturn_t iwl_pcie_isr_non_ict(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 inta; u32 inta;
@ -876,7 +875,7 @@ static irqreturn_t iwl_pcie_isr_non_ict(struct iwl_trans *trans)
* the interrupt we need to service, driver will set the entries back to 0 and * the interrupt we need to service, driver will set the entries back to 0 and
* set index. * set index.
*/ */
static irqreturn_t iwl_pcie_isr_ict(struct iwl_trans *trans) static irqreturn_t iwl_pcie_int_cause_ict(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
irqreturn_t ret; irqreturn_t ret;
@ -884,14 +883,6 @@ static irqreturn_t iwl_pcie_isr_ict(struct iwl_trans *trans)
u32 val = 0; u32 val = 0;
u32 read; u32 read;
/* dram interrupt table not set yet,
* use legacy interrupt.
*/
if (unlikely(!trans_pcie->use_ict)) {
ret = iwl_pcie_isr_non_ict(trans);
return ret;
}
trace_iwlwifi_dev_irq(trans->dev); trace_iwlwifi_dev_irq(trans->dev);
/* Ignore interrupt if there's nothing in NIC to service. /* Ignore interrupt if there's nothing in NIC to service.
@ -977,7 +968,14 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
spin_lock_irqsave(&trans_pcie->irq_lock, flags); spin_lock_irqsave(&trans_pcie->irq_lock, flags);
ret = iwl_pcie_isr_ict(trans); /* dram interrupt table not set yet,
* use legacy interrupt.
*/
if (likely(trans_pcie->use_ict))
ret = iwl_pcie_int_cause_ict(trans);
else
ret = iwl_pcie_int_cause_non_ict(trans);
if (ret != IRQ_WAKE_THREAD) { if (ret != IRQ_WAKE_THREAD) {
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags); spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
return ret; return ret;