Skip to contentSkip to conversation

staging: r8188eu: use max() and min() macros

PATCH In review Vihas Mak 2 participants 2 messages Nov 24, 2021 – Nov 25, 2021 Staging

lore
Share & tools
lore

Vihas Mak

author
#0 lore raw

PATCH v2 1/1 staging: r8188eu: use max() and min() macros

use max() and min() macros to fix following cocci warnings:

drivers/staging/r8188eu/core/rtw_wlan_util.c:719: WARNING opportunity for min() drivers/staging/r8188eu/core/rtw_wlan_util.c:724: WARNING opportunity for max()

---
v1 -> v2:
- fixed checkpatch issues (parenthesis alignment).

 drivers/staging/r8188eu/core/rtw_wlan_util.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_wlan_util.c +5 -9
index 6d4e21a16783..524e8d22075c 100644
@@ -716,15 +716,11 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
 			pmlmeinfo->HT_caps.u.HT_cap[i] &= (pIE->data[i]);
 		} else {
 			/* modify from  fw by Thomas 2010/11/17 */
-			if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3) > (pIE->data[i] & 0x3))
-				max_AMPDU_len = (pIE->data[i] & 0x3);
-			else
-				max_AMPDU_len = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3);
-
-			if ((pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c) > (pIE->data[i] & 0x1c))
-				min_MPDU_spacing = (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c);
-			else
-				min_MPDU_spacing = (pIE->data[i] & 0x1c);
+			max_AMPDU_len = min(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3,
+					    pIE->data[i] & 0x3);
+
+			min_MPDU_spacing = max(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x1c,
+					       pIE->data[i] & 0x1c);
 
 			pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para = max_AMPDU_len | min_MPDU_spacing;
 		}
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Vihas Mak

use max() and min() macros to fix following cocci warnings:

drivers/staging/r8188eu/core/rtw_wlan_util.c:719: WARNING opportunity for min() drivers/staging/r8188eu/core/rtw_wlan_util.c:724: WARNING opportunity for max()

---
v1 -> v2:
- fixed checkpatch issues (parenthesis alignment).

Looks good. Thanks!

regards,
dan carpenter