Commit fef0f427 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

wifi: rtlwifi: remove misused flag from HAL data 



Always rely on 'driver_is_goingto_unload' of 'struct rtl_hal'
and remove (presumably misused) 'driver_going2unload' from it.

Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230605100700.111644-1-dmantipov@yandex.ru
parent 55712325

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

+3 −3
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ static void _rtl92s_phy_set_rfhalt(struct ieee80211_hw *hw) 
	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	u8 u1btmp;



	if (rtlhal->driver_going2unload)

	if (rtlhal->driver_is_goingto_unload)

		rtl_write_byte(rtlpriv, 0x560, 0x0);



	/* Power save for BB/RF */
@@ -1323,7 +1323,7 @@ static void _rtl92s_phy_set_rfhalt(struct ieee80211_hw *hw) 
	rtl_write_word(rtlpriv, CMDR, 0x57FC);

	rtl_write_word(rtlpriv, CMDR, 0x0000);



	if (rtlhal->driver_going2unload) {

	if (rtlhal->driver_is_goingto_unload) {

		u1btmp = rtl_read_byte(rtlpriv, (REG_SYS_FUNC_EN + 1));

		u1btmp &= ~(BIT(0));

		rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN + 1, u1btmp);
@@ -1345,7 +1345,7 @@ static void _rtl92s_phy_set_rfhalt(struct ieee80211_hw *hw) 


	/* Power save for MAC */

	if (ppsc->rfoff_reason == RF_CHANGE_BY_IPS  &&

		!rtlhal->driver_going2unload) {

		!rtlhal->driver_is_goingto_unload) {

		/* enable LED function */

		rtl_write_byte(rtlpriv, 0x03, 0xF9);

	/* SW/HW radio off or halt adapter!! For example S3/S4 */

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

+0 −2
Original line number Diff line number Diff line
@@ -1673,8 +1673,6 @@ struct rtl_hal { 
	bool fw_clk_change_in_progress;

	bool allow_sw_to_change_hwclc;

	u8 fw_ps_state;

	/**/

	bool driver_going2unload;



	/*AMPDU init min space*/

	u8 minspace_cfg;	/*For Min spacing configurations */