net: wireless: rockchip_wlan: fix compile warning

zywang33 · zywang33 · commit ac042485f4a7 · 2017-11-29T11:47:45.000+08:00
fix this compile warning:
drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_p2p.c:3518:31:
warning: comparison of constant ‘3’ with boolean expression is alwa
false [-Wbool-compare] error, forbidden warning: rtw_p2p.c:3518

Change-Id: Ic900425434f3ae0069237bbe6d3cb8242e31ed0f
Signed-off-by: Chris Zhong &lt;zyw@rock-chips.com&gt;
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_p2p.c b/drivers/net/wireless/rockchip_wlan/rtl8189fs/core/rtw_p2p.c
@@ -3515,7 +3515,7 @@ _func_enter_;
 
 					rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
 					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&
-					!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					   (pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
 					{
 						val8 = 1;
 						rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
@@ -3539,7 +3539,7 @@ _func_enter_;
 				if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )
 				{
 					set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
-					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{						
 						val8 = 0;
 						rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723au/core/rtw_p2p.c b/drivers/net/wireless/rockchip_wlan/rtl8723au/core/rtw_p2p.c
@@ -3475,7 +3475,7 @@ _func_enter_;
 
 					rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
 					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&
-					!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					   (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{	
 						val8 = 1;
 						rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
@@ -3500,7 +3500,7 @@ _func_enter_;
 				{
 					set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
 					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&	
-					!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					   (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{
 						val8 = 0;
 						padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/core/rtw_p2p.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs-vq0/core/rtw_p2p.c
@@ -3504,7 +3504,7 @@ _func_enter_;
 
 					rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
 					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&
-					!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					   (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{
 						val8 = 1;
 						rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
@@ -3528,7 +3528,7 @@ _func_enter_;
 				if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )
 				{
 					set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
-					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{						
 						val8 = 0;
 						padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
diff --git a/drivers/net/wireless/rockchip_wlan/rtl8812au/core/rtw_p2p.c b/drivers/net/wireless/rockchip_wlan/rtl8812au/core/rtw_p2p.c
@@ -3504,7 +3504,7 @@ _func_enter_;
 
 					rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);
 					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&
-					!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					   (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{
 						val8 = 1;
 						rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));
@@ -3528,7 +3528,7 @@ _func_enter_;
 				if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )
 				{
 					set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
-					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
+					if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
 					{						
 						val8 = 0;
 						padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));

Original file line number	Diff line number	Diff line change
`@@ -3515,7 +3515,7 @@ _func_enter_;`
`3515`	`3515`
`3516`	`3516`	`rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);`
`3517`	`3517`	`if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&`
`3518`		`- !(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3518`	`+ (pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)`
`3519`	`3519`	`{`
`3520`	`3520`	`val8 = 1;`
`3521`	`3521`	`rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`
`@@ -3539,7 +3539,7 @@ _func_enter_;`
`3539`	`3539`	`if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )`
`3540`	`3540`	`{`
`3541`	`3541`	`set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);`
`3542`		`- if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3542`	`+ if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)`
`3543`	`3543`	`{`
`3544`	`3544`	`val8 = 0;`
`3545`	`3545`	`rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`
Original file line number	Diff line number	Diff line change
`@@ -3475,7 +3475,7 @@ _func_enter_;`
`3475`	`3475`
`3476`	`3476`	`rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);`
`3477`	`3477`	`if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&`
`3478`		`- !(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3478`	`+ (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)`
`3479`	`3479`	`{`
`3480`	`3480`	`val8 = 1;`
`3481`	`3481`	`rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`
`@@ -3500,7 +3500,7 @@ _func_enter_;`
`3500`	`3500`	`{`
`3501`	`3501`	`set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);`
`3502`	`3502`	`if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&`
`3503`		`- !(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3503`	`+ (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)`
`3504`	`3504`	`{`
`3505`	`3505`	`val8 = 0;`
`3506`	`3506`	`padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`
Original file line number	Diff line number	Diff line change
`@@ -3504,7 +3504,7 @@ _func_enter_;`
`3504`	`3504`
`3505`	`3505`	`rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN);`
`3506`	`3506`	`if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&`
`3507`		`- !(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3507`	`+ (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)`
`3508`	`3508`	`{`
`3509`	`3509`	`val8 = 1;`
`3510`	`3510`	`rtw_hal_set_hwreg(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`
`@@ -3528,7 +3528,7 @@ _func_enter_;`
`3528`	`3528`	`if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )`
`3529`	`3529`	`{`
`3530`	`3530`	`set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);`
`3531`		`- if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) &&!(pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)`
	`3531`	`+ if(!check_buddy_mlmeinfo_state(padapter, WIFI_FW_AP_STATE) && (pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)`
`3532`	`3532`	`{`
`3533`	`3533`	`val8 = 0;`
`3534`	`3534`	`padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_MLME_SITESURVEY, (u8 *)(&val8));`