[PATCH] rtw89: coex: fix for variable set but not used warning

[PATCH] rtw89: coex: fix for variable set but not used warning

[sunliming]

Fix below kernel warning:
drivers/net/wireless/realtek/rtw89/coex.c:3244:25: warning: variable 'cnt_connecting'
set but not used [-Wunused-but-set-variable]

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: sunliming <sunliming@kylinos.cn>
---
 drivers/net/wireless/realtek/rtw89/coex.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 683854bba217..ee4817358c35 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -3290,7 +3290,7 @@ static void _update_wl_info(struct rtw89_dev *rtwdev)
 	struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info;
 	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;
 	struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
-	u8 i, cnt_connect = 0, cnt_connecting = 0, cnt_active = 0;
+	u8 i, cnt_connect = 0, cnt_active = 0;
 	u8 cnt_2g = 0, cnt_5g = 0, phy;
 	u32 wl_2g_ch[2] = {0}, wl_5g_ch[2] = {0};
 	bool b2g = false, b5g = false, client_joined = false;
@@ -3324,9 +3324,7 @@ static void _update_wl_info(struct rtw89_dev *rtwdev)
 
 		if (wl_linfo[i].connected == MLME_NO_LINK) {
 			continue;
-		} else if (wl_linfo[i].connected == MLME_LINKING) {
-			cnt_connecting++;
-		} else {
+		} else if (wl_linfo[i].connected != MLME_LINKING) {
 			cnt_connect++;
 			if ((wl_linfo[i].role == RTW89_WIFI_ROLE_P2P_GO ||
 			     wl_linfo[i].role == RTW89_WIFI_ROLE_AP) &&
-- 
2.25.1

RE: [PATCH] rtw89: coex: fix for variable set but not used warning

[Ping-Ke Shih]

> -----Original Message-----
> From: sunliming <sunliming@kylinos.cn>
> Sent: Monday, September 12, 2022 9:44 AM
> To: Ping-Ke Shih <pkshih@realtek.com>; kvalo@kernel.org; davem@davemloft.net; edumazet@google.com;
> kuba@kernel.org; pabeni@redhat.com
> Cc: linux-wireless@vger.kernel.org; netdev@vger.kernel.org; kelulanainsley@gmail.com; sunliming
> <sunliming@kylinos.cn>; kernel test robot <lkp@intel.com>
> Subject: [PATCH] rtw89: coex: fix for variable set but not used warning

The subject should be 'wifi: rtw89: coex: ...'.

> 
> Fix below kernel warning:
> drivers/net/wireless/realtek/rtw89/coex.c:3244:25: warning: variable 'cnt_connecting'
> set but not used [-Wunused-but-set-variable]
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: sunliming <sunliming@kylinos.cn>
> ---
>  drivers/net/wireless/realtek/rtw89/coex.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
> index 683854bba217..ee4817358c35 100644
> --- a/drivers/net/wireless/realtek/rtw89/coex.c
> +++ b/drivers/net/wireless/realtek/rtw89/coex.c
> @@ -3290,7 +3290,7 @@ static void _update_wl_info(struct rtw89_dev *rtwdev)
>  	struct rtw89_btc_wl_link_info *wl_linfo = wl->link_info;
>  	struct rtw89_btc_wl_role_info *wl_rinfo = &wl->role_info;
>  	struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
> -	u8 i, cnt_connect = 0, cnt_connecting = 0, cnt_active = 0;
> +	u8 i, cnt_connect = 0, cnt_active = 0;
>  	u8 cnt_2g = 0, cnt_5g = 0, phy;
>  	u32 wl_2g_ch[2] = {0}, wl_5g_ch[2] = {0};
>  	bool b2g = false, b5g = false, client_joined = false;
> @@ -3324,9 +3324,7 @@ static void _update_wl_info(struct rtw89_dev *rtwdev)
> 
>  		if (wl_linfo[i].connected == MLME_NO_LINK) {
>  			continue;
> -		} else if (wl_linfo[i].connected == MLME_LINKING) {
> -			cnt_connecting++;
> -		} else {
> +		} else if (wl_linfo[i].connected != MLME_LINKING) {
>  			cnt_connect++;
>  			if ((wl_linfo[i].role == RTW89_WIFI_ROLE_P2P_GO ||
>  			     wl_linfo[i].role == RTW89_WIFI_ROLE_AP) &&

Though this patch can fix warning, we would like to show cnt_connecting in 
debug message, and then we can know the transient state between no link and 
connected. I will send it by myself.

So, nack this patch.

--
Ping-Ke