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

Commit d623d24a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: clean up in power code 



Reduce indentation where it is possible.
Make a function static - it wasn't used outside its file
anyway.
Remove the unneeded pm_prevent state.

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

drivers/net/wireless/iwlwifi/mvm/mvm.h

+0 −5
Original line number Diff line number Diff line
@@ -353,8 +353,6 @@ struct iwl_mvm_vif { 


	/* FW identified misbehaving AP */

	u8 uapsd_misbehaving_bssid[ETH_ALEN];



	bool pm_prevented;

};



static inline struct iwl_mvm_vif *
@@ -943,9 +941,6 @@ int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm, 
int iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,

				  struct ieee80211_vif *vif,

				  u32 flags);

int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,

				   struct iwl_beacon_filter_cmd *cmd,

				   u32 flags);

int iwl_mvm_update_beacon_abort(struct iwl_mvm *mvm,

				struct ieee80211_vif *vif, bool enable);

int iwl_mvm_update_beacon_filter(struct iwl_mvm *mvm,

drivers/net/wireless/iwlwifi/mvm/power.c

+27 −34
Original line number Diff line number Diff line
@@ -74,16 +74,11 @@ 


#define POWER_KEEP_ALIVE_PERIOD_SEC    25



static

int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm,

				   struct iwl_beacon_filter_cmd *cmd,

				   u32 flags)

{

	int ret;



	ret = iwl_mvm_send_cmd_pdu(mvm, REPLY_BEACON_FILTERING_CMD, flags,

				   sizeof(struct iwl_beacon_filter_cmd), cmd);



	if (!ret) {

	IWL_DEBUG_POWER(mvm, "ba_enable_beacon_abort is: %d\n",

			le32_to_cpu(cmd->ba_enable_beacon_abort));

	IWL_DEBUG_POWER(mvm, "ba_escape_timer is: %d\n",
@@ -106,8 +101,9 @@ int iwl_mvm_beacon_filter_send_cmd(struct iwl_mvm *mvm, 
			le32_to_cpu(cmd->bf_temp_fast_filter));

	IWL_DEBUG_POWER(mvm, "bf_temp_slow_filter is: %d\n",

			le32_to_cpu(cmd->bf_temp_slow_filter));

	}

	return ret;



	return iwl_mvm_send_cmd_pdu(mvm, REPLY_BEACON_FILTERING_CMD, flags,

				    sizeof(struct iwl_beacon_filter_cmd), cmd);

}



static
@@ -313,7 +309,7 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
	    mvmvif->dbgfs_pm.disable_power_off)

		cmd->flags &= cpu_to_le16(~POWER_FLAGS_POWER_SAVE_ENA_MSK);

#endif

	if (!vif->bss_conf.ps || mvmvif->pm_prevented ||

	if (!vif->bss_conf.ps || mvm->bound_vif_cnt > 1 ||

	    iwl_mvm_vif_low_latency(mvmvif))

		return;
@@ -549,12 +545,9 @@ int iwl_mvm_power_uapsd_misbehaving_ap_notif(struct iwl_mvm *mvm, 
static void iwl_mvm_power_binding_iterator(void *_data, u8 *mac,

					   struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_mvm *mvm = _data;

	int ret;



	mvmvif->pm_prevented = (mvm->bound_vif_cnt <= 1) ? false : true;



	ret = iwl_mvm_power_mac_update_mode(mvm, vif);

	WARN_ONCE(ret, "Failed to update power parameters on a specific vif\n");

}