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

Commit 76d7b12c authored by Christos Gkekas's avatar Christos Gkekas Committed by Kalle Valo
Browse files

rtlwifi: Remove unused cur_rfstate variables 



Clean up unused cur_rfstate variables in rtl8188ee, rtl8723ae, rtl8723be
and rtl8821ae.

Signed-off-by: default avatarChristos Gkekas <chris.gekas@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 84efbad4

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c

+1 −3
Original line number Diff line number Diff line
@@ -2236,7 +2236,7 @@ bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;

	enum rf_pwrstate e_rfpowerstate_toset;

	u32 u4tmp;

	bool b_actuallyset = false;
@@ -2255,8 +2255,6 @@ bool rtl88ee_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
		spin_unlock(&rtlpriv->locks.rf_ps_lock);

	}



	cur_rfstate = ppsc->rfpwr_state;



	u4tmp = rtl_read_dword(rtlpriv, REG_GPIO_OUTPUT);

	e_rfpowerstate_toset = (u4tmp & BIT(31)) ? ERFON : ERFOFF;

drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c

+1 −3
Original line number Diff line number Diff line
@@ -2104,7 +2104,7 @@ bool rtl8723e_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	struct rtl_phy *rtlphy = &(rtlpriv->phy);

	enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;

	enum rf_pwrstate e_rfpowerstate_toset;

	u8 u1tmp;

	bool b_actuallyset = false;
@@ -2123,8 +2123,6 @@ bool rtl8723e_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
		spin_unlock(&rtlpriv->locks.rf_ps_lock);

	}



	cur_rfstate = ppsc->rfpwr_state;



	rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,

		       rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2)&~(BIT(1)));

drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c

+1 −3
Original line number Diff line number Diff line
@@ -2487,7 +2487,7 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	struct rtl_phy *rtlphy = &(rtlpriv->phy);

	enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;

	enum rf_pwrstate e_rfpowerstate_toset;

	u8 u1tmp;

	bool b_actuallyset = false;
@@ -2506,8 +2506,6 @@ bool rtl8723be_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
		spin_unlock(&rtlpriv->locks.rf_ps_lock);

	}



	cur_rfstate = ppsc->rfpwr_state;



	rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,

		       rtl_read_byte(rtlpriv, REG_GPIO_IO_SEL_2) & ~(BIT(1)));

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c

+1 −3
Original line number Diff line number Diff line
@@ -3846,7 +3846,7 @@ bool rtl8821ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	struct rtl_phy *rtlphy = &rtlpriv->phy;

	enum rf_pwrstate e_rfpowerstate_toset, cur_rfstate;

	enum rf_pwrstate e_rfpowerstate_toset;

	u8 u1tmp = 0;

	bool b_actuallyset = false;
@@ -3865,8 +3865,6 @@ bool rtl8821ae_gpio_radio_on_off_checking(struct ieee80211_hw *hw, u8 *valid) 
		spin_unlock(&rtlpriv->locks.rf_ps_lock);

	}



	cur_rfstate = ppsc->rfpwr_state;



	rtl_write_byte(rtlpriv, REG_GPIO_IO_SEL_2,

			rtl_read_byte(rtlpriv,

					REG_GPIO_IO_SEL_2) & ~(BIT(1)));