staging: r8188eu: replace ternary operator with min, max, abs macros
PATCH 1/1 staging: r8188eu: replace ternary operator with min, max, abs macros
Replace some ternary operators with the min(), max() or abs() macros to improve readability.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/r8188eu/core/rtw_xmit.c | 3 +-- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/r8188eu/core/rtw_xmit.c +1 -2
@@ -476,8 +476,7 @@ static uint rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) {uint len; - len =rtw_remainder_len (pfile); - len = (rlen > len) ? len : rlen; + len =min (rtw_remainder_len (pfile), rlen);if (rmem)skb_copy_bits (pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len);
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +1 -1
@@ -583,7 +583,7 @@ static bool phy_SimularityCompare_8188E( tmp2 = resulta[c2][i]; } - diff = (tmp1 > tmp2) ? (tmp1 - tmp2) : (tmp2 - tmp1); + diff =abs (tmp1 - tmp2);if (diff >MAX_TOLERANCE ) {if ((i ==2 || i ==6 ) && !sim_bitmap) {
drivers/staging/r8188eu/hal/odm_RTL8188E.c +2 -2
@@ -199,7 +199,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) Aux_RSSI = (dm_fat_tbl->AuxAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->AuxAnt_Sum[i] / dm_fat_tbl->AuxAnt_Cnt[i]) :0 ; TargetAnt = (Main_RSSI >= Aux_RSSI) ?MAIN_ANT :AUX_ANT ;/* 2 Select MaxRSSI for DIG */ - LocalMaxRSSI = (Main_RSSI > Aux_RSSI) ? Main_RSSI : Aux_RSSI; + LocalMaxRSSI =max (Main_RSSI, Aux_RSSI);if ((LocalMaxRSSI > AntDivMaxRSSI) && (LocalMaxRSSI <40 )) AntDivMaxRSSI = LocalMaxRSSI;if (LocalMaxRSSI > MaxRSSI)
@@ -211,7 +211,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)else if ((dm_fat_tbl->RxIdleAnt ==AUX_ANT ) && (Aux_RSSI ==0 )) Aux_RSSI = Main_RSSI; - LocalMinRSSI = (Main_RSSI > Aux_RSSI) ? Aux_RSSI : Main_RSSI; + LocalMinRSSI =min (Main_RSSI, Aux_RSSI);if (LocalMinRSSI < MinRSSI) { MinRSSI = LocalMinRSSI; RxIdleAnt = TargetAnt;
Signature · 1 line
2.38.0
Quoted 51 lines · Michael Straube
Replace some ternary operators with the
min(),max()orabs()macros to improve readability.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/core/rtw_xmit.c | 3 +-- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)drivers/staging/r8188eu/core/rtw_xmit.c +1
-2@@ -476,8 +476,7 @@ static uint rtw_pktfile_read(struct pkt_file *pfile, u8 *rmem, uint rlen) {uint len; - len =rtw_remainder_len (pfile); - len = (rlen > len) ? len : rlen; + len =min (rtw_remainder_len (pfile), rlen);if (rmem)skb_copy_bits (pfile->pkt, pfile->buf_len - pfile->pkt_len, rmem, len);drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +1
-1@@ -583,7 +583,7 @@ static bool phy_SimularityCompare_8188E( tmp2 = resulta[c2][i]; } - diff = (tmp1 > tmp2) ? (tmp1 - tmp2) : (tmp2 - tmp1); + diff =abs (tmp1 - tmp2);if (diff >MAX_TOLERANCE ) {if ((i ==2 || i ==6 ) && !sim_bitmap) {drivers/staging/r8188eu/hal/odm_RTL8188E.c +1
-1@@ -199,7 +199,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) Aux_RSSI = (dm_fat_tbl->AuxAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->AuxAnt_Sum[i] / dm_fat_tbl->AuxAnt_Cnt[i]) :0 ; TargetAnt = (Main_RSSI >= Aux_RSSI) ?MAIN_ANT :AUX_ANT ;/* 2 Select MaxRSSI for DIG */ - LocalMaxRSSI = (Main_RSSI > Aux_RSSI) ? Main_RSSI : Aux_RSSI; + LocalMaxRSSI =max (Main_RSSI, Aux_RSSI);if ((LocalMaxRSSI > AntDivMaxRSSI) && (LocalMaxRSSI <40 )) AntDivMaxRSSI = LocalMaxRSSI;if (LocalMaxRSSI > MaxRSSI)
drivers/staging/r8188eu/hal/odm_RTL8188E.c static void odm_HWAntDiv(struct odm_dm_struct *dm_odm) · line 217
Quoted 8 lines
drivers/staging/r8188eu/hal/odm_RTL8188E.c +1
-1@@ -211,7 +211,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)else if ((dm_fat_tbl->RxIdleAnt ==AUX_ANT ) && (Aux_RSSI ==0 )) Aux_RSSI = Main_RSSI; - LocalMinRSSI = (Main_RSSI > Aux_RSSI) ? Aux_RSSI : Main_RSSI; + LocalMinRSSI =min (Main_RSSI, Aux_RSSI);if (LocalMinRSSI < MinRSSI) { MinRSSI = LocalMinRSSI; RxIdleAnt = TargetAnt;