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

Commit 0aa86df6 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: move some PCIe calls to better places 



Synchronizing the IRQ is pointless when we will
then enable the RF-Kill interrupt again, but is
needed before we free it and the data needed to
handle IRQs; move it to the free function.

Simiarly, cancelling the replenish work struct
can move to the function that frees the RX data
structures.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a8b691e6

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

+2 −0
Original line number Diff line number Diff line
@@ -545,6 +545,8 @@ void iwl_pcie_rx_free(struct iwl_trans *trans) 
		return;

	}



	cancel_work_sync(&trans_pcie->rx_replenish);



	spin_lock_irqsave(&rxq->lock, flags);

	iwl_pcie_rxq_free_rbs(trans);

	spin_unlock_irqrestore(&rxq->lock, flags);

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

+3 −6
Original line number Diff line number Diff line
@@ -534,12 +534,6 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) 


	iwl_enable_rfkill_int(trans);



	/* wait to make sure we flush pending tasklet*/

	synchronize_irq(trans_pcie->pci_dev->irq);

	tasklet_kill(&trans_pcie->irq_tasklet);



	cancel_work_sync(&trans_pcie->rx_replenish);



	/* stop and reset the on-board processor */

	iwl_write32(trans, CSR_RESET, CSR_RESET_REG_FLAG_NEVO_RESET);
@@ -682,6 +676,9 @@ void iwl_trans_pcie_free(struct iwl_trans *trans) 
{

	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);



	synchronize_irq(trans_pcie->pci_dev->irq);

	tasklet_kill(&trans_pcie->irq_tasklet);



	iwl_pcie_tx_free(trans);

	iwl_pcie_rx_free(trans);