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

Commit 30462b51 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Remove unused parameter from rtl_ps_set_rf_state() 



Commit 4b9d8d67 ("rtlwifi: rtl8192cu: Remove unused parameter") reworked
this routine. Those changes were later reverted by commit d3feae41
("rtlwifi: Update power-save routines for 062814 driver").

There were two changes in commit 4b9d8d67. The first of these removed
a parameter from rtl_ps_set_rf_state() that was always false. This is the
change that is restored in the current patch. A second change that reworked
the locking is still being analyzed.

In addition to removing the unused parameter, there is no need for
rtl_ps_set_rf_state() to be exported.

Reported-by: default avatarPavel Andrianov <andrianov@ispras.ru>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Pavel Andrianov <andrianov@ispras.ru>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent bf942091

drivers/net/wireless/realtek/rtlwifi/ps.c

+9 −16
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(rtl_ps_disable_nic);



bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,

static bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,

				enum rf_pwrstate state_toset,

			 u32 changesource, bool protect_or_not)

				u32 changesource)

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
@@ -86,9 +86,6 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw, 
	bool actionallowed = false;

	u16 rfwait_cnt = 0;



	if (protect_or_not)

		goto no_protect;



	/*Only one thread can change

	 *the RF state at one time, and others

	 *should wait to be executed.
@@ -119,7 +116,6 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw, 
		}

	}



no_protect:

	rtstate = ppsc->rfpwr_state;



	switch (state_toset) {
@@ -162,15 +158,12 @@ bool rtl_ps_set_rf_state(struct ieee80211_hw *hw, 
	if (actionallowed)

		rtlpriv->cfg->ops->set_rf_power_state(hw, state_toset);



	if (!protect_or_not) {

	spin_lock(&rtlpriv->locks.rf_ps_lock);

	ppsc->rfchange_inprogress = false;

	spin_unlock(&rtlpriv->locks.rf_ps_lock);

	}



	return actionallowed;

}

EXPORT_SYMBOL(rtl_ps_set_rf_state);



static void _rtl_ps_inactive_ps(struct ieee80211_hw *hw)

{
@@ -191,7 +184,7 @@ static void _rtl_ps_inactive_ps(struct ieee80211_hw *hw) 
	}



	rtl_ps_set_rf_state(hw, ppsc->inactive_pwrstate,

			    RF_CHANGE_BY_IPS, false);

			    RF_CHANGE_BY_IPS);



	if (ppsc->inactive_pwrstate == ERFOFF &&

	    rtlhal->interface == INTF_PCI) {
@@ -587,7 +580,7 @@ void rtl_swlps_rf_awake(struct ieee80211_hw *hw) 
	}



	spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);

	rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS, false);

	rtl_ps_set_rf_state(hw, ERFON, RF_CHANGE_BY_PS);

	spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);

}
@@ -630,7 +623,7 @@ void rtl_swlps_rf_sleep(struct ieee80211_hw *hw) 
	spin_unlock(&rtlpriv->locks.rf_ps_lock);



	spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag);

	rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS , false);

	rtl_ps_set_rf_state(hw, ERFSLEEP, RF_CHANGE_BY_PS);

	spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);



	if (ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM &&

drivers/net/wireless/realtek/rtlwifi/ps.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 


#define MAX_SW_LPS_SLEEP_INTV	5



bool rtl_ps_set_rf_state(struct ieee80211_hw *hw,

			 enum rf_pwrstate state_toset, u32 changesource,

			 bool protect_or_not);

bool rtl_ps_enable_nic(struct ieee80211_hw *hw);

bool rtl_ps_disable_nic(struct ieee80211_hw *hw);

void rtl_ips_nic_off(struct ieee80211_hw *hw);