Bladeren bron

qcacld-3.0: Minor cleanup of previous PS timeout change

Some cleanup is needed around a previous code change that reset the
power save timeout when power save is requested from user space.
Perform minor code cleanup, moving a logging statement and removing
a blank line.

Change-Id: Idc656fbaba16e58ef57625b5f9d5de37a191793a
CRs-Fixed: 1066022
Dustin Brown 8 jaren geleden
bovenliggende
commit
ecfce63fdd
2 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2 2
      core/hdd/src/wlan_hdd_power.c
  2. 0 1
      core/sme/src/common/sme_power_save.c

+ 2 - 2
core/hdd/src/wlan_hdd_power.c

@@ -2008,14 +2008,14 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 	QDF_STATUS qdf_status;
 	int status;
 
+	ENTER();
+
 	if (timeout < 0) {
 		hdd_notice("User space timeout: %d; Using default instead: %d",
 			timeout, AUTO_PS_ENTRY_USER_TIMER_DEFAULT_VALUE);
 		timeout = AUTO_PS_ENTRY_USER_TIMER_DEFAULT_VALUE;
 	}
 
-	ENTER();
-
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EINVAL;

+ 0 - 1
core/sme/src/common/sme_power_save.c

@@ -982,7 +982,6 @@ tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 
 /**
  * sme_ps_enable_auto_ps_timer(): Enable power-save auto timer with timeout
- *
  * @hal_ctx:	HAL context
  * @session_id:	adapter session Id
  * @timeout:	timeout period in ms