Staging: rtl8188eu: Remove ternary operator
PATCH 1/1 Staging: rtl8188eu: Remove ternary operator
Relational and logical operators evaluate to either true or false. Explicit conversion is not needed so remove the ternary operator. Done using coccinelle:
@r@
expression A,B;
symbol true,false;
binary operator b = {==,!=,&&,||,>=,<=,>,<};
@@
- (A b B) ? true : false
+ A b B
--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +4 -4
@@ -705,7 +705,7 @@ static int issue_probereq_ex(struct adapter *padapter,unsigned long start = jiffies; do { - ret = issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false); + ret = issue_probereq(padapter, pssid, da, wait_ms > 0); i++;
@@ -1293,7 +1293,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow da = pnetwork->MacAddress; do { - ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0 ? true : false); + ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0); i++;
@@ -1420,7 +1420,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int da = pnetwork->MacAddress; do { - ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0 ? true : false); + ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0); i++;
@@ -1527,7 +1527,7 @@ static int issue_deauth_ex(struct adapter *padapter, u8 *da,unsigned long start = jiffies; do { - ret = _issue_deauth(padapter, da, reason, wait_ms > 0 ? true : false); + ret = _issue_deauth(padapter, da, reason, wait_ms > 0); i++;
drivers/staging/rtl8188eu/hal/phy.c +1 -1
@@ -1292,7 +1292,7 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery) rOFDM0_RxIQExtAnta};bool is2t; - is2t = (dm_odm->RFType ==ODM_2T2R ) ? true : false; + is2t = dm_odm->RFType ==ODM_2T2R ;if (!(dm_odm->SupportAbility &ODM_RF_CALIBRATION ))return ;
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +2 -1
@@ -60,7 +60,8 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_CUT_VER , cut_ver); -ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP , hal_data->VersionID.ChipType ==NORMAL_CHIP ? true : false); +ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_MP_TEST_CHIP , + hal_data->VersionID.ChipType ==NORMAL_CHIP );ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_PATCH_ID , hal_data->CustomerID);ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_BWIFI_TEST , Adapter->registrypriv.wifi_spec);
Signature · 1 line
1.9.1
Quoted 51 lines · Bhumika Goyal
Relational and logical operators evaluate to either true or false. Explicit conversion is not needed so remove the ternary operator. Done using coccinelle:
@r@
expression A,B;
symbol true,false;
binary operator b = {==,!=,&&,||,>=,<=,>,<};
@@
- (A b B) ? true : false
+ A b BSigned-off-by Bhumika Goyal <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +3
-3@@ -705,7 +705,7 @@ static int issue_probereq_ex(struct adapter *padapter,unsigned long start = jiffies; do { - ret = issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false); + ret = issue_probereq(padapter, pssid, da, wait_ms > 0); i++;@@ -1293,7 +1293,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow da = pnetwork->MacAddress; do { - ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0 ? true : false); + ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0); i++;@@ -1420,7 +1420,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int da = pnetwork->MacAddress; do { - ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0 ? true : false); + ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0); i++;
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c static int issue_deauth_ex(struct adapter *padapter, u8 *da, · line 1532
Quoted 7 lines
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +1
-1@@ -1527,7 +1527,7 @@ static int issue_deauth_ex(struct adapter *padapter, u8 *da,unsigned long start = jiffies; do { - ret = _issue_deauth(padapter, da, reason, wait_ms > 0 ? true : false); + ret = _issue_deauth(padapter, da, reason, wait_ms > 0); i++;
While this part of the patch is technically correct, I would argue it doesn't improve the code. It would make the code more readable to pass in the wait_ms value and then have the decision made based on that in the called function.
Cheers,
Jes
Quoted 58 lines · Jes Sorensen
Quoted 57 lines · Bhumika Goyal
Relational and logical operators evaluate to either true or false. Explicit conversion is not needed so remove the ternary operator. Done using coccinelle:
@r@
expression A,B;
symbol true,false;
binary operator b = {==,!=,&&,||,>=,<=,>,<};
@@
- (A b B) ? true : false
+ A b BSigned-off-by Bhumika Goyal <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 8 ++++---- drivers/staging/rtl8188eu/hal/phy.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-)drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +4
-4@@ -705,7 +705,7 @@ static int issue_probereq_ex(struct adapter *padapter,unsigned long start = jiffies; do { - ret = issue_probereq(padapter, pssid, da, wait_ms > 0 ? true : false); + ret = issue_probereq(padapter, pssid, da, wait_ms > 0); i++;@@ -1293,7 +1293,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow da = pnetwork->MacAddress; do { - ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0 ? true : false); + ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0); i++;@@ -1420,7 +1420,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int da = pnetwork->MacAddress; do { - ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0 ? true : false); + ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0); i++;@@ -1527,7 +1527,7 @@ static int issue_deauth_ex(struct adapter *padapter, u8 *da,unsigned long start = jiffies; do { - ret = _issue_deauth(padapter, da, reason, wait_ms > 0 ? true : false); + ret = _issue_deauth(padapter, da, reason, wait_ms > 0);
Quoted 7 lines
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c static int issue_deauth_ex(struct adapter *padapter, u8 *da, · line 1532
Quoted 1 line
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +0
-0i++;While this part of the patch is technically correct, I would argue it doesn't improve the code. It would make the code more readable to pass in the
wait_msvalue and then have the decision made based on that in the called function.
Ok, I will keep the wait_ms ternary operation as it is and send a v2. Thanks for the input.
Thanks,
Bhumika
Quoted 3 lines
Cheers,
Jes