[PATCH 38/61] staging: rtl8723bs: remove redundant ternary operators from bool returns
From: Arsenii Pashchenko
Date: Wed Jul 15 2026 - 09:00:41 EST
Purge all implicit and redundant ternary operator expressions of the form
'(condition) ? true : false' or comparisons with zero from logical return
statements across the driver.
Expressions like '(atomic_read(...) != 0) ? true : false' add useless
visual clutter and unnecessary branching, since the underlying comparison
or atomic read already naturally evaluates to a boolean truth value in C.
Replace these verbose patterns with direct return statements to streamline
the code, maximize readability, and match standard kernel coding style.
Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +-
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 2 +-
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 11 ++++++++---
drivers/staging/rtl8723bs/hal/hal_com.c | 2 +-
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +-
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 ++--
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 4 ++--
drivers/staging/rtl8723bs/include/ieee80211.h | 6 +++---
drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 2 +-
drivers/staging/rtl8723bs/os_dep/osdep_service.c | 4 ++--
11 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index b57b665c2..7e5f73707 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -1629,7 +1629,7 @@ inline bool rtw_is_scan_deny(struct adapter *adapter)
{
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
- return (atomic_read(&mlmepriv->set_scan_deny) != 0) ? true : false;
+ return atomic_read(&mlmepriv->set_scan_deny);
}
inline void rtw_clear_scan_deny(struct adapter *adapter)
@@ -2197,8 +2197,8 @@ void rtw_ht_use_default_setting(struct adapter *padapter)
else
phtpriv->bss_coexist = 0;
- phtpriv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1)) ? true : false;
- phtpriv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0)) ? true : false;
+ phtpriv->sgi_40m = TEST_FLAG(pregistrypriv->short_gi, BIT(1));
+ phtpriv->sgi_20m = TEST_FLAG(pregistrypriv->short_gi, BIT(0));
/* LDPC support */
rtw_hal_get_def_var(padapter, HAL_DEF_RX_LDPC, (u8 *)&bHwLDPCSupport);
diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index df5508ce5..d833c5e3a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -476,7 +476,7 @@ static bool _rtw_camid_is_gk(struct adapter *adapter, u8 cam_id)
if (!(cam_ctl->bitmap & BIT(cam_id)))
goto exit;
- ret = (dvobj->cam_cache[cam_id].ctrl & BIT(6)) ? true : false;
+ ret = dvobj->cam_cache[cam_id].ctrl & BIT(6);
exit:
return ret;
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h
index 7a12d92da..f39c93ac7 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h
@@ -15,7 +15,7 @@
#define BT_INFO_8723B_1ANT_B_CONNECTION BIT(0)
#define BT_INFO_8723B_1ANT_A2DP_BASIC_RATE(_BT_INFO_EXT_) \
- (((_BT_INFO_EXT_ & BIT(0))) ? true : false)
+ (((_BT_INFO_EXT_ & BIT(0))))
#define BTC_RSSI_COEX_THRESH_TOL_8723B_1ANT 2
diff --git a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
index 36b0f429d..0002b822a 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
+++ b/drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h
@@ -93,9 +93,14 @@ enum {
BTC_RSSI_STATE_STAY_LOW = 0x5,
BTC_RSSI_MAX
};
-#define BTC_RSSI_HIGH(_rssi_) ((_rssi_ == BTC_RSSI_STATE_HIGH || _rssi_ == BTC_RSSI_STATE_STAY_HIGH) ? true : false)
-#define BTC_RSSI_MEDIUM(_rssi_) ((_rssi_ == BTC_RSSI_STATE_MEDIUM || _rssi_ == BTC_RSSI_STATE_STAY_MEDIUM) ? true : false)
-#define BTC_RSSI_LOW(_rssi_) ((_rssi_ == BTC_RSSI_STATE_LOW || _rssi_ == BTC_RSSI_STATE_STAY_LOW) ? true : false)
+#define BTC_RSSI_HIGH(_rssi_) \
+ ((_rssi_) == BTC_RSSI_STATE_HIGH || (_rssi_) == BTC_RSSI_STATE_STAY_HIGH)
+
+#define BTC_RSSI_MEDIUM(_rssi_) \
+ ((_rssi_) == BTC_RSSI_STATE_MEDIUM || (_rssi_) == BTC_RSSI_STATE_STAY_MEDIUM)
+
+#define BTC_RSSI_LOW(_rssi_) \
+ ((_rssi_) == BTC_RSSI_STATE_LOW || (_rssi_) == BTC_RSSI_STATE_STAY_LOW)
enum {
BTC_WIFI_BW_LEGACY = 0x0,
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 634af4657..77b189efa 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -396,7 +396,7 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 NumOutPipe)
{
struct registry_priv *pregistrypriv = &padapter->registrypriv;
- bool bWIFICfg = (pregistrypriv->wifi_spec) ? true : false;
+ bool bWIFICfg = pregistrypriv->wifi_spec;
bool result = true;
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index c88d669cb..5b374eea0 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -268,7 +268,7 @@ static void odm_Process_RSSIForDM(
if (pPktinfo->is_beacon)
pDM_Odm->PhyDbgInfo.NumQryBeaconPkt++;
- isCCKrate = ((pPktinfo->data_rate <= DESC_RATE11M)) ? true : false;
+ isCCKrate = pPktinfo->data_rate <= DESC_RATE11M;
pDM_Odm->RxRate = pPktinfo->data_rate;
/* Statistic for antenna/path diversity------------------ */
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 53f6cd708..7ddc75e65 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2751,7 +2751,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
{
/* BCN_VALID, BIT16 of REG_TDECTRL = BIT0 of REG_TDECTRL+2 */
val8 = rtw_read8(padapter, REG_TDECTRL+2);
- *val = (BIT(0) & val8) ? true : false;
+ *val = BIT(0) & val8;
}
break;
@@ -2805,7 +2805,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
break;
case HW_VAR_CHK_HI_QUEUE_EMPTY:
val16 = rtw_read16(padapter, REG_TXPKT_EMPTY);
- *val = (val16 & BIT(10)) ? true : false;
+ *val = val16 & BIT(10);
break;
default:
GetHwReg(padapter, variable, val);
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index ed9b8fb07..767db342c 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1032,8 +1032,8 @@ static void _ReadPROMContent(struct adapter *padapter)
eeValue = rtw_read8(padapter, REG_9346CR);
/* To check system boot selection. */
- pEEPROM->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false;
- pEEPROM->bautoload_fail_flag = (eeValue & EEPROM_EN) ? false : true;
+ pEEPROM->EepromOrEfuse = eeValue & BOOT_FROM_EEPROM;
+ pEEPROM->bautoload_fail_flag = eeValue & EEPROM_EN;
_ReadEfuseInfo8723BS(padapter);
}
diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 39ee139f1..3363c6496 100644
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -155,10 +155,10 @@ enum network_type {
#define is_legacy_only(net_type) ((net_type) == ((net_type) & (WIRELESS_11BG)))
-#define is_supported_24g(net_type) ((net_type) & SUPPORTED_24G_NETTYPE_MSK ? true : false)
+#define is_supported_24g(net_type) ((net_type) & SUPPORTED_24G_NETTYPE_MSK)
-#define is_supported_tx_cck(net_type) (((net_type) & (WIRELESS_11B)) ? true : false)
-#define is_supported_ht(net_type) (((net_type) & (WIRELESS_11_24N)) ? true : false)
+#define is_supported_tx_cck(net_type) (((net_type) & (WIRELESS_11B)))
+#define is_supported_ht(net_type) (((net_type) & (WIRELESS_11_24N)))
struct ieee_param {
u32 cmd;
diff --git a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
index 9b6c42e4f..bcf141274 100644
--- a/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
+++ b/drivers/staging/rtl8723bs/include/rtw_pwrctrl.h
@@ -80,7 +80,7 @@ enum rt_rf_power_state {
#define RT_RF_LPS_DISALBE_2R BIT(30) /* When LPS is on, disable 2R if no packet is received or transmitted. */
#define RT_RF_LPS_LEVEL_ASPM BIT(31) /* LPS with ASPM */
-#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG) ? true : false)
+#define RT_IN_PS_LEVEL(ppsc, _PS_FLAG) ((ppsc->cur_ps_level & _PS_FLAG))
#define RT_CLEAR_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level &= (~(_PS_FLAG)))
#define RT_SET_PS_LEVEL(ppsc, _PS_FLAG) (ppsc->cur_ps_level |= _PS_FLAG)
diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index 4cfdf7c62..214c1fd9b 100644
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -130,7 +130,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)
*/
inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf)
{
- return (cbuf->write == cbuf->read - 1) ? true : false;
+ return cbuf->write == cbuf->read - 1;
}
/**
@@ -141,7 +141,7 @@ inline bool rtw_cbuf_full(struct rtw_cbuf *cbuf)
*/
inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf)
{
- return (cbuf->write == cbuf->read) ? true : false;
+ return cbuf->write == cbuf->read;
}
/**
--
2.55.0