[PATCH v2 1/5] staging: rtl8723bs: use preferred comparison order

Erick Karanja posted 5 patches 1 month, 1 week ago
[PATCH v2 1/5] staging: rtl8723bs: use preferred comparison order
Posted by Erick Karanja 1 month, 1 week ago
Refactor  conditions check to follow the Linux kernel
coding style, which prefers placing the variable on the left side
of the comparison.

Reported by checkpatch:

	WARNING: Comparisons should place the constant on the right side
    of the test

Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
---
 drivers/staging/rtl8723bs/hal/hal_btcoex.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index b72cf520d576..9105594d2dde 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -91,7 +91,7 @@ static void halbtcoutsrc_LeaveLowPower(struct btc_coexist *pBtCoexist)
 	stime = jiffies;
 	do {
 		ready = rtw_register_task_alive(padapter, BTCOEX_ALIVE);
-		if (_SUCCESS == ready)
+		if (ready == _SUCCESS)
 			break;
 
 		utime = jiffies_to_msecs(jiffies - stime);
@@ -668,7 +668,7 @@ static void halbtcoutsrc_WriteLocalReg1Byte(void *pBtcContext, u32 RegAddr, u8 D
 	struct btc_coexist *pBtCoexist = (struct btc_coexist *)pBtcContext;
 	struct adapter *Adapter = pBtCoexist->Adapter;
 
-	if (BTC_INTF_SDIO == pBtCoexist->chipInterface)
+	if (pBtCoexist->chipInterface == BTC_INTF_SDIO)
 		rtw_write8(Adapter, SDIO_LOCAL_BASE | RegAddr, Data);
 	else
 		rtw_write8(Adapter, RegAddr, Data);
@@ -894,7 +894,7 @@ void EXhalbtcoutsrc_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (IPS_NONE == type)
+	if (type == IPS_NONE)
 		ipsType = BTC_IPS_LEAVE;
 	else
 		ipsType = BTC_IPS_ENTER;
@@ -922,7 +922,7 @@ void EXhalbtcoutsrc_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (PS_MODE_ACTIVE == type)
+	if (type == PS_MODE_ACTIVE)
 		lpsType = BTC_LPS_DISABLE;
 	else
 		lpsType = BTC_LPS_ENABLE;
@@ -1000,7 +1000,7 @@ void EXhalbtcoutsrc_MediaStatusNotify(struct btc_coexist *pBtCoexist, enum
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (RT_MEDIA_CONNECT == mediaStatus)
+	if (mediaStatus == RT_MEDIA_CONNECT)
 		mStatus = BTC_MEDIA_CONNECT;
 	else
 		mStatus = BTC_MEDIA_DISCONNECT;
@@ -1026,11 +1026,11 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy
 	if (pBtCoexist->bManualControl)
 		return;
 
-	if (PACKET_DHCP == pktType) {
+	if (pktType == PACKET_DHCP) {
 		packetType = BTC_PACKET_DHCP;
-	} else if (PACKET_EAPOL == pktType) {
+	} else if (pktType == PACKET_EAPOL) {
 		packetType = BTC_PACKET_EAPOL;
-	} else if (PACKET_ARP == pktType) {
+	} else if (pktType == PACKET_ARP) {
 		packetType = BTC_PACKET_ARP;
 	} else {
 		return;
@@ -1114,13 +1114,13 @@ void EXhalbtcoutsrc_Periodical(struct btc_coexist *pBtCoexist)
 
 void EXhalbtcoutsrc_SetAntNum(u8 type, u8 antNum)
 {
-	if (BT_COEX_ANT_TYPE_PG == type) {
+	if (type == BT_COEX_ANT_TYPE_PG) {
 		GLBtCoexist.boardInfo.pgAntNum = antNum;
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
-	} else if (BT_COEX_ANT_TYPE_ANTDIV == type) {
+	} else if (type == BT_COEX_ANT_TYPE_ANTDIV) {
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
 		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
-	} else if (BT_COEX_ANT_TYPE_DETECTED == type) {
+	} else if (type == BT_COEX_ANT_TYPE_DETECTED) {
 		GLBtCoexist.boardInfo.btdmAntNum = antNum;
 		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
 	}
-- 
2.43.0
Re: [PATCH v2 1/5] staging: rtl8723bs: use preferred comparison order
Posted by Julia Lawall 1 month, 1 week ago
On Tue, 1 Apr 2025, Erick Karanja wrote:

> Refactor  conditions check to follow the Linux kernel
> coding style, which prefers placing the variable on the left side
> of the comparison.

You have already done thing, which looks ok.  But if you like, you could
try writing a semantic patch that makes this change.

constant c; is a metavariable that matches a constant, approximated as a
word in full capital letters.

julia

>
> Reported by checkpatch:
>
> 	WARNING: Comparisons should place the constant on the right side
>     of the test
>
> Signed-off-by: Erick Karanja <karanja99erick@gmail.com>
> ---
>  drivers/staging/rtl8723bs/hal/hal_btcoex.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> index b72cf520d576..9105594d2dde 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> @@ -91,7 +91,7 @@ static void halbtcoutsrc_LeaveLowPower(struct btc_coexist *pBtCoexist)
>  	stime = jiffies;
>  	do {
>  		ready = rtw_register_task_alive(padapter, BTCOEX_ALIVE);
> -		if (_SUCCESS == ready)
> +		if (ready == _SUCCESS)
>  			break;
>
>  		utime = jiffies_to_msecs(jiffies - stime);
> @@ -668,7 +668,7 @@ static void halbtcoutsrc_WriteLocalReg1Byte(void *pBtcContext, u32 RegAddr, u8 D
>  	struct btc_coexist *pBtCoexist = (struct btc_coexist *)pBtcContext;
>  	struct adapter *Adapter = pBtCoexist->Adapter;
>
> -	if (BTC_INTF_SDIO == pBtCoexist->chipInterface)
> +	if (pBtCoexist->chipInterface == BTC_INTF_SDIO)
>  		rtw_write8(Adapter, SDIO_LOCAL_BASE | RegAddr, Data);
>  	else
>  		rtw_write8(Adapter, RegAddr, Data);
> @@ -894,7 +894,7 @@ void EXhalbtcoutsrc_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
>  	if (pBtCoexist->bManualControl)
>  		return;
>
> -	if (IPS_NONE == type)
> +	if (type == IPS_NONE)
>  		ipsType = BTC_IPS_LEAVE;
>  	else
>  		ipsType = BTC_IPS_ENTER;
> @@ -922,7 +922,7 @@ void EXhalbtcoutsrc_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)
>  	if (pBtCoexist->bManualControl)
>  		return;
>
> -	if (PS_MODE_ACTIVE == type)
> +	if (type == PS_MODE_ACTIVE)
>  		lpsType = BTC_LPS_DISABLE;
>  	else
>  		lpsType = BTC_LPS_ENABLE;
> @@ -1000,7 +1000,7 @@ void EXhalbtcoutsrc_MediaStatusNotify(struct btc_coexist *pBtCoexist, enum
>  	if (pBtCoexist->bManualControl)
>  		return;
>
> -	if (RT_MEDIA_CONNECT == mediaStatus)
> +	if (mediaStatus == RT_MEDIA_CONNECT)
>  		mStatus = BTC_MEDIA_CONNECT;
>  	else
>  		mStatus = BTC_MEDIA_DISCONNECT;
> @@ -1026,11 +1026,11 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy
>  	if (pBtCoexist->bManualControl)
>  		return;
>
> -	if (PACKET_DHCP == pktType) {
> +	if (pktType == PACKET_DHCP) {
>  		packetType = BTC_PACKET_DHCP;
> -	} else if (PACKET_EAPOL == pktType) {
> +	} else if (pktType == PACKET_EAPOL) {
>  		packetType = BTC_PACKET_EAPOL;
> -	} else if (PACKET_ARP == pktType) {
> +	} else if (pktType == PACKET_ARP) {
>  		packetType = BTC_PACKET_ARP;
>  	} else {
>  		return;
> @@ -1114,13 +1114,13 @@ void EXhalbtcoutsrc_Periodical(struct btc_coexist *pBtCoexist)
>
>  void EXhalbtcoutsrc_SetAntNum(u8 type, u8 antNum)
>  {
> -	if (BT_COEX_ANT_TYPE_PG == type) {
> +	if (type == BT_COEX_ANT_TYPE_PG) {
>  		GLBtCoexist.boardInfo.pgAntNum = antNum;
>  		GLBtCoexist.boardInfo.btdmAntNum = antNum;
> -	} else if (BT_COEX_ANT_TYPE_ANTDIV == type) {
> +	} else if (type == BT_COEX_ANT_TYPE_ANTDIV) {
>  		GLBtCoexist.boardInfo.btdmAntNum = antNum;
>  		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
> -	} else if (BT_COEX_ANT_TYPE_DETECTED == type) {
> +	} else if (type == BT_COEX_ANT_TYPE_DETECTED) {
>  		GLBtCoexist.boardInfo.btdmAntNum = antNum;
>  		/* GLBtCoexist.boardInfo.btdmAntPos = BTC_ANTENNA_AT_MAIN_PORT; */
>  	}
> --
> 2.43.0
>
>
>