Commit 3c519605 authored by Yan-Hsuan Chuang's avatar Yan-Hsuan Chuang Committed by Kalle Valo
Browse files

rtw88: remove redundant flag check helper function 



These helper functions seems useless. And in some cases
we want to use test_and_[set/clear]_bit, these helpers
will make the code more complicated. So remove them.

Signed-off-by: default avatarYan-Hsuan Chuang <yhchuang@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 66070e86

drivers/net/wireless/realtek/rtw88/coex.c

+2 −2
Original line number Diff line number Diff line
@@ -383,9 +383,9 @@ static void rtw_coex_update_wl_link_info(struct rtw_dev *rtwdev, u8 reason) 
	u8 rssi_step;

	u8 rssi;



	scan = rtw_flag_check(rtwdev, RTW_FLAG_SCANNING);

	scan = test_bit(RTW_FLAG_SCANNING, rtwdev->flags);

	coex_stat->wl_connected = !!rtwdev->sta_cnt;

	coex_stat->wl_gl_busy = rtw_flag_check(rtwdev, RTW_FLAG_BUSY_TRAFFIC);

	coex_stat->wl_gl_busy = test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);



	if (stats->tx_throughput > stats->rx_throughput)

		coex_stat->wl_tput_dir = COEX_WL_TPUT_TX;

drivers/net/wireless/realtek/rtw88/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw) 
	rtwdev->h2c.last_box_num = 0;

	rtwdev->h2c.seq = 0;



	rtw_flag_set(rtwdev, RTW_FLAG_FW_RUNNING);

	set_bit(RTW_FLAG_FW_RUNNING, rtwdev->flags);



	return 0;

drivers/net/wireless/realtek/rtw88/mac80211.c

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static void rtw_ops_tx(struct ieee80211_hw *hw, 
	struct rtw_dev *rtwdev = hw->priv;

	struct rtw_tx_pkt_info pkt_info = {0};



	if (!rtw_flag_check(rtwdev, RTW_FLAG_RUNNING))

	if (!test_bit(RTW_FLAG_RUNNING, rtwdev->flags))

		goto out;



	rtw_tx_pkt_info_update(rtwdev, &pkt_info, control, skb);
@@ -474,8 +474,8 @@ static void rtw_ops_sw_scan_start(struct ieee80211_hw *hw, 


	rtw_coex_scan_notify(rtwdev, COEX_SCAN_START);



	rtw_flag_set(rtwdev, RTW_FLAG_DIG_DISABLE);

	rtw_flag_set(rtwdev, RTW_FLAG_SCANNING);

	set_bit(RTW_FLAG_DIG_DISABLE, rtwdev->flags);

	set_bit(RTW_FLAG_SCANNING, rtwdev->flags);



	mutex_unlock(&rtwdev->mutex);

}
@@ -489,8 +489,8 @@ static void rtw_ops_sw_scan_complete(struct ieee80211_hw *hw, 


	mutex_lock(&rtwdev->mutex);



	rtw_flag_clear(rtwdev, RTW_FLAG_SCANNING);

	rtw_flag_clear(rtwdev, RTW_FLAG_DIG_DISABLE);

	clear_bit(RTW_FLAG_SCANNING, rtwdev->flags);

	clear_bit(RTW_FLAG_DIG_DISABLE, rtwdev->flags);



	ether_addr_copy(rtwvif->mac_addr, vif->addr);

	config |= PORT_SET_MAC_ADDR;

drivers/net/wireless/realtek/rtw88/main.c

+10 −10
Original line number Diff line number Diff line
@@ -150,20 +150,20 @@ static void rtw_watch_dog_work(struct work_struct *work) 
	struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,

					      watch_dog_work.work);

	struct rtw_watch_dog_iter_data data = {};

	bool busy_traffic = rtw_flag_check(rtwdev, RTW_FLAG_BUSY_TRAFFIC);

	bool busy_traffic = test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);



	if (!rtw_flag_check(rtwdev, RTW_FLAG_RUNNING))

	if (!test_bit(RTW_FLAG_RUNNING, rtwdev->flags))

		return;



	ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->watch_dog_work,

				     RTW_WATCH_DOG_DELAY_TIME);



	if (rtwdev->stats.tx_cnt > 100 || rtwdev->stats.rx_cnt > 100)

		rtw_flag_set(rtwdev, RTW_FLAG_BUSY_TRAFFIC);

		set_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);

	else

		rtw_flag_clear(rtwdev, RTW_FLAG_BUSY_TRAFFIC);

		clear_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);



	if (busy_traffic != rtw_flag_check(rtwdev, RTW_FLAG_BUSY_TRAFFIC))

	if (busy_traffic != test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags))

		rtw_coex_wl_status_change_notify(rtwdev);



	/* reset tx/rx statictics */
@@ -183,7 +183,7 @@ static void rtw_watch_dog_work(struct work_struct *work) 
	    data.rtwvif && !data.active && data.assoc_cnt == 1)

		rtw_enter_lps(rtwdev, data.rtwvif);



	if (rtw_flag_check(rtwdev, RTW_FLAG_SCANNING))

	if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))

		return;



	rtw_phy_dynamic_mechanism(rtwdev);
@@ -311,7 +311,7 @@ void rtw_set_channel(struct rtw_dev *rtwdev) 
	if (hal->current_band_type == RTW_BAND_5G) {

		rtw_coex_switchband_notify(rtwdev, COEX_SWITCH_TO_5G);

	} else {

		if (rtw_flag_check(rtwdev, RTW_FLAG_SCANNING))

		if (test_bit(RTW_FLAG_SCANNING, rtwdev->flags))

			rtw_coex_switchband_notify(rtwdev, COEX_SWITCH_TO_24G);

		else

			rtw_coex_switchband_notify(rtwdev, COEX_SWITCH_TO_24G_NOFORSCAN);
@@ -737,7 +737,7 @@ int rtw_core_start(struct rtw_dev *rtwdev) 
	ieee80211_queue_delayed_work(rtwdev->hw, &rtwdev->watch_dog_work,

				     RTW_WATCH_DOG_DELAY_TIME);



	rtw_flag_set(rtwdev, RTW_FLAG_RUNNING);

	set_bit(RTW_FLAG_RUNNING, rtwdev->flags);



	return 0;

}
@@ -752,8 +752,8 @@ void rtw_core_stop(struct rtw_dev *rtwdev) 
{

	struct rtw_coex *coex = &rtwdev->coex;



	rtw_flag_clear(rtwdev, RTW_FLAG_RUNNING);

	rtw_flag_clear(rtwdev, RTW_FLAG_FW_RUNNING);

	clear_bit(RTW_FLAG_RUNNING, rtwdev->flags);

	clear_bit(RTW_FLAG_FW_RUNNING, rtwdev->flags);



	cancel_delayed_work_sync(&rtwdev->watch_dog_work);

	cancel_delayed_work_sync(&coex->bt_relink_work);

drivers/net/wireless/realtek/rtw88/main.h

+0 −15
Original line number Diff line number Diff line
@@ -1378,21 +1378,6 @@ struct rtw_dev { 


#include "hci.h"



static inline bool rtw_flag_check(struct rtw_dev *rtwdev, enum rtw_flags flag)

{

	return test_bit(flag, rtwdev->flags);

}



static inline void rtw_flag_clear(struct rtw_dev *rtwdev, enum rtw_flags flag)

{

	clear_bit(flag, rtwdev->flags);

}



static inline void rtw_flag_set(struct rtw_dev *rtwdev, enum rtw_flags flag)

{

	set_bit(flag, rtwdev->flags);

}



static inline bool rtw_is_assoc(struct rtw_dev *rtwdev)

{

	return !!rtwdev->sta_cnt;