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

Commit 23ba9340 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove unused parameter from grab_nic_access 



All the callers used silent = false.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a3f7ba5c

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base, 
		ptr = base + (4 * sizeof(u32)) + (start_idx * 3 * sizeof(u32));



	/* Make sure device is powered up for SRAM reads */

	if (!iwl_trans_grab_nic_access(priv->trans, false, &reg_flags))

	if (!iwl_trans_grab_nic_access(priv->trans, &reg_flags))

		return;



	/* Set starting address; reads will auto-increment */
@@ -1731,7 +1731,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 
	ptr = base + EVENT_START_OFFSET + (start_idx * event_size);



	/* Make sure device is powered up for SRAM reads */

	if (!iwl_trans_grab_nic_access(trans, false, &reg_flags))

	if (!iwl_trans_grab_nic_access(trans, &reg_flags))

		return pos;



	/* Set starting address; reads will auto-increment */

drivers/net/wireless/intel/iwlwifi/dvm/tt.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void iwl_tt_check_exit_ct_kill(unsigned long data) 
			priv->thermal_throttle.ct_kill_toggle = true;

		}

		iwl_read32(priv->trans, CSR_UCODE_DRV_GP1);

		if (iwl_trans_grab_nic_access(priv->trans, false, &flags))

		if (iwl_trans_grab_nic_access(priv->trans, &flags))

			iwl_trans_release_nic_access(priv->trans, &flags);



		/* Reschedule the ct_kill timer to occur in

drivers/net/wireless/intel/iwlwifi/iwl-io.c

+7 −7
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg) 
{

	u32 value = 0x5a5a5a5a;

	unsigned long flags;

	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		value = iwl_read32(trans, reg);

		iwl_trans_release_nic_access(trans, &flags);

	}
@@ -95,7 +95,7 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value) 
{

	unsigned long flags;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		iwl_write32(trans, reg, value);

		iwl_trans_release_nic_access(trans, &flags);

	}
@@ -138,7 +138,7 @@ u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs) 
	unsigned long flags;

	u32 val = 0x5a5a5a5a;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		val = iwl_read_prph_no_grab(trans, ofs);

		iwl_trans_release_nic_access(trans, &flags);

	}
@@ -150,7 +150,7 @@ void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val) 
{

	unsigned long flags;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		iwl_write_prph_no_grab(trans, ofs, val);

		iwl_trans_release_nic_access(trans, &flags);

	}
@@ -176,7 +176,7 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask) 
{

	unsigned long flags;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		iwl_write_prph_no_grab(trans, ofs,

				       iwl_read_prph_no_grab(trans, ofs) |

				       mask);
@@ -190,7 +190,7 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, 
{

	unsigned long flags;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		iwl_write_prph_no_grab(trans, ofs,

				       (iwl_read_prph_no_grab(trans, ofs) &

					mask) | bits);
@@ -204,7 +204,7 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask) 
	unsigned long flags;

	u32 val;



	if (iwl_trans_grab_nic_access(trans, false, &flags)) {

	if (iwl_trans_grab_nic_access(trans, &flags)) {

		val = iwl_read_prph_no_grab(trans, ofs);

		iwl_write_prph_no_grab(trans, ofs, (val & ~mask));

		iwl_trans_release_nic_access(trans, &flags);

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+3 −4
Original line number Diff line number Diff line
@@ -652,8 +652,7 @@ struct iwl_trans_ops { 
	void (*configure)(struct iwl_trans *trans,

			  const struct iwl_trans_config *trans_cfg);

	void (*set_pmi)(struct iwl_trans *trans, bool state);

	bool (*grab_nic_access)(struct iwl_trans *trans, bool silent,

				unsigned long *flags);

	bool (*grab_nic_access)(struct iwl_trans *trans, unsigned long *flags);

	void (*release_nic_access)(struct iwl_trans *trans,

				   unsigned long *flags);

	void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask,
@@ -1170,9 +1169,9 @@ iwl_trans_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value) 
	trans->ops->set_bits_mask(trans, reg, mask, value);

}



#define iwl_trans_grab_nic_access(trans, silent, flags)	\

#define iwl_trans_grab_nic_access(trans, flags)	\

	__cond_lock(nic_access,				\

		    likely((trans)->ops->grab_nic_access(trans, silent, flags)))

		    likely((trans)->ops->grab_nic_access(trans, flags)))



static inline void __releases(nic_access)

iwl_trans_release_nic_access(struct iwl_trans *trans, unsigned long *flags)

drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void iwl_mvm_dump_fifos(struct iwl_mvm *mvm, 
	unsigned long flags;

	int i, j;



	if (!iwl_trans_grab_nic_access(mvm->trans, false, &flags))

	if (!iwl_trans_grab_nic_access(mvm->trans, &flags))

		return;



	/* Pull RXF data from all RXFs */
@@ -359,7 +359,7 @@ static u32 iwl_dump_prph(struct iwl_trans *trans, 
	unsigned long flags;

	u32 prph_len = 0, i;



	if (!iwl_trans_grab_nic_access(trans, false, &flags))

	if (!iwl_trans_grab_nic_access(trans, &flags))

		return 0;



	for (i = 0; i < ARRAY_SIZE(iwl_prph_dump_addr); i++) {