Skip to contentSkip to conversation

staging: r8188eu: remove ternary operator

PATCH New Michael Straube 1 participant 3 messages Apr 5, 2022 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

v2 cover staging: r8188eu: remove ternary operator

This series removes unnecessary uses of ternary operator that explicitly set true or false and removes unused macros from ieee80211.h.

v2:
- Do not remove ternary operator where the condition does not evaluate to true or false.
- Added patch that removes unused macros from ieee80211.h

Michael Straube (2):
staging: r8188eu: remove unncessary ternary operator
staging: r8188eu: remove unused macros from ieee80211.h

 drivers/staging/r8188eu/core/rtw_p2p.c         |  2 +-
 drivers/staging/r8188eu/core/rtw_pwrctrl.c     |  4 ++--
 drivers/staging/r8188eu/core/rtw_sta_mgt.c     |  4 ++--
 drivers/staging/r8188eu/core/rtw_wlan_util.c   |  2 +-
 drivers/staging/r8188eu/hal/hal_com.c          |  2 +-
 drivers/staging/r8188eu/hal/odm_HWConfig.c     |  4 ++--
 drivers/staging/r8188eu/include/HalVerDef.h    |  4 ++--
 drivers/staging/r8188eu/include/ieee80211.h    | 18 ------------------
 drivers/staging/r8188eu/os_dep/osdep_service.c |  2 +-
 9 files changed, 12 insertions(+), 30 deletions(-)
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH v2 1/2 staging: r8188eu: remove unncessary ternary operator

There are some uses of ternary operator where it explicitly sets true or false but the condition already evaluates to true or false. In this cases the ternary operator is redundant and can be removed.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_p2p.c         | 2 +-
 drivers/staging/r8188eu/core/rtw_pwrctrl.c     | 4 ++--
 drivers/staging/r8188eu/core/rtw_sta_mgt.c     | 4 ++--
 drivers/staging/r8188eu/core/rtw_wlan_util.c   | 2 +-
 drivers/staging/r8188eu/hal/hal_com.c          | 2 +-
 drivers/staging/r8188eu/hal/odm_HWConfig.c     | 4 ++--
 drivers/staging/r8188eu/include/HalVerDef.h    | 4 ++--
 drivers/staging/r8188eu/os_dep/osdep_service.c | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/core/rtw_p2p.c +1 -1
index 1e728a03e0ac..80305d128ccd 100644
@@ -951,7 +951,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
 	/* issue Device Discoverability Response */
 	issue_p2p_devdisc_resp(pwdinfo, GetAddr2Ptr(pframe), status, dialogToken);
 
-	return (status == P2P_STATUS_SUCCESS) ? true : false;
+	return status == P2P_STATUS_SUCCESS;
 }
 
 u32 process_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *pframe, uint len)
drivers/staging/r8188eu/core/rtw_pwrctrl.c +2 -2
index 5d468e8b4920..4537b51ff8bc 100644
@@ -348,7 +348,7 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter)
 
 	pwrctrlpriv->LpsIdleCount = 0;
 	pwrctrlpriv->power_mgnt = padapter->registrypriv.power_mgnt;/*  PS_MODE_MIN; */
-	pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false;
+	pwrctrlpriv->bLeisurePs = PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt;
 
 	pwrctrlpriv->bFwCurrentInPSMode = false;
 

@@ -424,7 +424,7 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
 			else
 				pwrctrlpriv->LpsIdleCount = 2;
 			pwrctrlpriv->power_mgnt = mode;
-			pwrctrlpriv->bLeisurePs = (PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt) ? true : false;
+			pwrctrlpriv->bLeisurePs = PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt;
 		}
 	} else {
 		ret = -EINVAL;
drivers/staging/r8188eu/core/rtw_sta_mgt.c +2 -2
index 91ff82f24f1f..357f98e22d8a 100644
@@ -470,9 +470,9 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
 	spin_unlock_bh(&pacl_node_q->lock);
 
 	if (pacl_list->mode == 1)/* accept unless in deny list */
-		res = (match) ? false : true;
+		res = !match;
 	else if (pacl_list->mode == 2)/* deny unless in accept list */
-		res = (match) ? true : false;
+		res = match;
 	else
 		res = true;
drivers/staging/r8188eu/core/rtw_wlan_util.c +1 -1
index b526715a70bc..84ced6a86df9 100644
@@ -1482,7 +1482,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
 		tid = (param >> 2) & 0x0f;
 		preorder_ctrl = &psta->recvreorder_ctrl[tid];
 		preorder_ctrl->indicate_seq = 0xffff;
-		preorder_ctrl->enable = (pmlmeinfo->bAcceptAddbaReq) ? true : false;
+		preorder_ctrl->enable = pmlmeinfo->bAcceptAddbaReq;
 	}
 }
drivers/staging/r8188eu/hal/hal_com.c +1 -1
index 06f2a9083056..7649f9919f67 100644
@@ -267,7 +267,7 @@ static void three_out_pipe(struct adapter *adapter, bool wifi_cfg)
 bool Hal_MappingOutPipe(struct adapter *adapter, u8 numoutpipe)
 {
 	struct registry_priv *pregistrypriv = &adapter->registrypriv;
-	bool  wifi_cfg = (pregistrypriv->wifi_spec) ? true : false;
+	bool wifi_cfg = pregistrypriv->wifi_spec;
 	bool result = true;
 
 	switch (numoutpipe) {
drivers/staging/r8188eu/hal/odm_HWConfig.c +2 -2
index 1183e4a522c0..54cc3d7789cd 100644
@@ -65,7 +65,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,
 
 	struct phy_status_rpt *pPhyStaRpt = (struct phy_status_rpt *)pPhyStatus;
 
-	isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
+	isCCKrate = pPktinfo->Rate >= DESC92C_RATE1M && pPktinfo->Rate <= DESC92C_RATE11M;
 
 	if (isCCKrate) {
 		u8 cck_agc_rpt;

@@ -234,7 +234,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,
 	if ((!pPktinfo->bPacketMatchBSSID))
 		return;
 
-	isCCKrate = ((pPktinfo->Rate >= DESC92C_RATE1M) && (pPktinfo->Rate <= DESC92C_RATE11M)) ? true : false;
+	isCCKrate = pPktinfo->Rate >= DESC92C_RATE1M && pPktinfo->Rate <= DESC92C_RATE11M;
 
 	/* Smart Antenna Debug Message------------------  */
 	if ((dm_odm->AntDivType == CG_TRX_HW_ANTDIV) || (dm_odm->AntDivType == CGCS_RX_HW_ANTDIV)) {
drivers/staging/r8188eu/include/HalVerDef.h +2 -2
index 2bc18eabb55d..56dadadb1a0f 100644
@@ -34,10 +34,10 @@ struct HAL_VERSION {
 
 /* HAL_CHIP_TYPE_E */
 #define IS_NORMAL_CHIP(version)				\
-	((GET_CVID_CHIP_TYPE(version) == NORMAL_CHIP) ? true : false)
+	(GET_CVID_CHIP_TYPE(version) == NORMAL_CHIP)
 
 /* HAL_VENDOR_E */
 #define IS_CHIP_VENDOR_TSMC(version)			\
-	((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_TSMC) ? true : false)
+	(GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_TSMC)
 
 #endif
drivers/staging/r8188eu/os_dep/osdep_service.c +1 -1
index fc10eefe04a9..6824a6ab2e36 100644
@@ -211,7 +211,7 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)
  */
 inline bool rtw_cbuf_empty(struct rtw_cbuf *cbuf)
 {
-	return (cbuf->write == cbuf->read) ? true : false;
+	return cbuf->write == cbuf->read;
 }
 
 /**
Signature · 1 line
2.35.1
author
#2 lore raw

PATCH v2 2/2 staging: r8188eu: remove unused macros from ieee80211.h

In reply to Michael Straube

Remove unused macros from ieee80211.h.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/r8188eu/include/ieee80211.h | 18 ------------------
 1 file changed, 18 deletions(-)
drivers/staging/r8188eu/include/ieee80211.h +0 -18
index 8c20363cdd31..bf4ce3cba46f 100644
@@ -123,24 +123,6 @@ enum NETWORK_TYPE {
 	WIRELESS_11BG_24N = (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N),
 };
 
-#define SUPPORTED_24G_NETTYPE_MSK				\
-	 (WIRELESS_11B | WIRELESS_11G | WIRELESS_11_24N)
-
-#define IsSupported24G(NetType)					\
-	((NetType) & SUPPORTED_24G_NETTYPE_MSK ? true : false)
-
-#define IsEnableHWCCK(NetType)					\
-	IsSupported24G(NetType)
-
-#define IsSupportedRxCCK(NetType) IsEnableHWCCK(NetType)
-
-#define IsSupportedTxCCK(NetType)				\
-	((NetType) & (WIRELESS_11B) ? true : false)
-#define IsSupportedTxOFDM(NetType)				\
-	((NetType) & (WIRELESS_11G) ? true : false)
-#define IsSupportedTxMCS(NetType)				\
-	((NetType) & (WIRELESS_11_24N) ? true : false)
-
 struct ieee_param {
 	u32 cmd;
 	u8 sta_addr[ETH_ALEN];
Signature · 1 line
2.35.1