Commit 6c6ff293 authored by Deepak R Varma's avatar Deepak R Varma Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Use min/max macros for variable comparison 



Simplify code by using min and max helper macros in place of lengthy
if/else block oriented logical evaluation and value assignment. This
issue is identified by coccicheck using the minmax.cocci file.

Signed-off-by: default avatarDeepak R Varma <drv@mailo.com>
Link: https://lore.kernel.org/r/Y2OK6fcIkH3S2/1f@qemulion


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f541335e

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+4 −8
Original line number Diff line number Diff line
@@ -986,15 +986,11 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_80211_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);

			max_AMPDU_len = min(pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x3,

					    pIE->data[i] & 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);

			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;

		}

drivers/staging/rtl8723bs/hal/odm_DIG.c

+1 −4
Original line number Diff line number Diff line
@@ -598,10 +598,7 @@ void odm_DIGbyRSSI_LPS(void *pDM_VOID) 
	/* Lower bound checking */



	/* RSSI Lower bound check */

	if ((pDM_Odm->RSSI_Min-10) > DM_DIG_MIN_NIC)

		RSSI_Lower = pDM_Odm->RSSI_Min-10;

	else

		RSSI_Lower = DM_DIG_MIN_NIC;

	RSSI_Lower = max(pDM_Odm->RSSI_Min - 10, DM_DIG_MIN_NIC);



	/* Upper and Lower Bound checking */

	if (CurrentIGI > DM_DIG_MAX_NIC)