Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c317c9 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Emmanuel Grumbach
Browse files

iwlwifi: pcie: remove minor dead code 



inta is checked to be zero in a IRQ_NONE branch so afterwards it
cannot be zero as it is never modified.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
[reword the patch title and fix comment]
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 8c21c538

drivers/net/wireless/iwlwifi/pcie/rx.c

+11 −15
Original line number Diff line number Diff line
@@ -1126,7 +1126,6 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) 
	struct iwl_trans *trans = data;

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u32 inta, inta_mask;

	irqreturn_t ret = IRQ_NONE;



	lockdep_assert_held(&trans_pcie->irq_lock);
@@ -1155,7 +1154,16 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) 
	 * or due to sporadic interrupts thrown from our NIC. */

	if (!inta) {

		IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n");

		goto none;

		/*

		 * Re-enable interrupts here since we don't have anything to

		 * service, but only in case the handler won't run. Note that

		 * the handler can be scheduled because of a previous

		 * interrupt.

		 */

		if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&

		    !trans_pcie->inta)

			iwl_enable_interrupts(trans);

		return IRQ_NONE;

	}



	if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
@@ -1173,19 +1181,7 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) 


	trans_pcie->inta |= inta;

	/* the thread will service interrupts and re-enable them */

	if (likely(inta))

	return IRQ_WAKE_THREAD;



	ret = IRQ_HANDLED;



none:

	/* re-enable interrupts here since we don't have anything to service. */

	/* only Re-enable if disabled by irq  and no schedules tasklet. */

	if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&

	    !trans_pcie->inta)

		iwl_enable_interrupts(trans);



	return ret;

}



/* interrupt handler using ict table, with this interrupt driver will