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

Commit 30a12a8f authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: change iwl_enable/disable_interrupts to "inline" 



iwl_enable_interrupts is being called inside the interrupt,
change from function call to inline

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4c423a2b

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −25
Original line number Diff line number Diff line
@@ -1749,31 +1749,6 @@ void iwl_uninit_drv(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_uninit_drv);





void iwl_disable_interrupts(struct iwl_priv *priv)

{

	clear_bit(STATUS_INT_ENABLED, &priv->status);



	/* disable interrupts from uCode/NIC to host */

	iwl_write32(priv, CSR_INT_MASK, 0x00000000);



	/* acknowledge/clear/reset any interrupts still pending

	 * from uCode or flow handler (Rx/Tx DMA) */

	iwl_write32(priv, CSR_INT, 0xffffffff);

	iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);

	IWL_DEBUG_ISR(priv, "Disabled interrupts\n");

}

EXPORT_SYMBOL(iwl_disable_interrupts);



void iwl_enable_interrupts(struct iwl_priv *priv)

{

	IWL_DEBUG_ISR(priv, "Enabling interrupts\n");

	set_bit(STATUS_INT_ENABLED, &priv->status);

	iwl_write32(priv, CSR_INT_MASK, priv->inta_mask);

}

EXPORT_SYMBOL(iwl_enable_interrupts);





#define ICT_COUNT (PAGE_SIZE/sizeof(u32))



/* Free dram table */

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −2
Original line number Diff line number Diff line
@@ -458,8 +458,6 @@ int iwl_send_card_state(struct iwl_priv *priv, u32 flags, 
/*****************************************************

 * PCI						     *

 *****************************************************/

void iwl_disable_interrupts(struct iwl_priv *priv);

void iwl_enable_interrupts(struct iwl_priv *priv);

irqreturn_t iwl_isr_legacy(int irq, void *data);

int iwl_reset_ict(struct iwl_priv *priv);

void iwl_disable_ict(struct iwl_priv *priv);

drivers/net/wireless/iwlwifi/iwl-helpers.h

+21 −0
Original line number Diff line number Diff line
@@ -145,4 +145,25 @@ static inline void iwl_stop_queue(struct iwl_priv *priv, u8 queue) 
#define ieee80211_stop_queue DO_NOT_USE_ieee80211_stop_queue

#define ieee80211_wake_queue DO_NOT_USE_ieee80211_wake_queue



static inline void iwl_disable_interrupts(struct iwl_priv *priv)

{

	clear_bit(STATUS_INT_ENABLED, &priv->status);



	/* disable interrupts from uCode/NIC to host */

	iwl_write32(priv, CSR_INT_MASK, 0x00000000);



	/* acknowledge/clear/reset any interrupts still pending

	 * from uCode or flow handler (Rx/Tx DMA) */

	iwl_write32(priv, CSR_INT, 0xffffffff);

	iwl_write32(priv, CSR_FH_INT_STATUS, 0xffffffff);

	IWL_DEBUG_ISR(priv, "Disabled interrupts\n");

}



static inline void iwl_enable_interrupts(struct iwl_priv *priv)

{

	IWL_DEBUG_ISR(priv, "Enabling interrupts\n");

	set_bit(STATUS_INT_ENABLED, &priv->status);

	iwl_write32(priv, CSR_INT_MASK, priv->inta_mask);

}



#endif				/* __iwl_helpers_h__ */