Commit 43ea9201 authored by Vihas Makwana's avatar Vihas Makwana Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: fix warnings in rtw_pwrctrl 



Refactor the code to fix following warnings:
    WARNING: Comparisons should place the constant on the right side of the test

Signed-off-by: default avatarVihas Makwana <makvihas@gmail.com>
Link: https://lore.kernel.org/r/20220517140626.3716-3-makvihas@gmail.com


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

drivers/staging/r8188eu/core/rtw_pwrctrl.c

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int ips_leave(struct adapter *padapter) 
			pwrpriv->rf_pwrstate = rf_on;

		}



		if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) || (_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) {

		if ((psecuritypriv->dot11PrivacyAlgrthm == _WEP40_) || (psecuritypriv->dot11PrivacyAlgrthm == _WEP104_)) {

			set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);

			for (keyid = 0; keyid < 4; keyid++) {

				if (pmlmepriv->key_mask & BIT(keyid)) {
@@ -198,7 +198,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
		return;



	if (pwrpriv->pwr_mode == ps_mode) {

		if (PS_MODE_ACTIVE == ps_mode)

		if (ps_mode == PS_MODE_ACTIVE)

			return;



		if ((pwrpriv->smart_ps == smart_ps) &&
@@ -356,7 +356,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;

	pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;



	pwrctrlpriv->bFwCurrentInPSMode = false;
@@ -409,12 +409,12 @@ int rtw_pm_set_lps(struct adapter *padapter, u8 mode) 


	if (mode < PS_MODE_NUM) {

		if (pwrctrlpriv->power_mgnt != mode) {

			if (PS_MODE_ACTIVE == mode)

			if (mode == PS_MODE_ACTIVE)

				LeaveAllPowerSaveMode(padapter);

			else

				pwrctrlpriv->LpsIdleCount = 2;

			pwrctrlpriv->power_mgnt = mode;

			pwrctrlpriv->bLeisurePs = PS_MODE_ACTIVE != pwrctrlpriv->power_mgnt;

			pwrctrlpriv->bLeisurePs = pwrctrlpriv->power_mgnt != PS_MODE_ACTIVE;

		}

	} else {

		ret = -EINVAL;
@@ -432,7 +432,7 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode) 
		return 0;

	} else if (mode == IPS_NONE) {

		rtw_ips_mode_req(pwrctrlpriv, mode);

		if ((padapter->bSurpriseRemoved == 0) && (_FAIL == rtw_pwr_wakeup(padapter)))

		if ((padapter->bSurpriseRemoved == 0) && (rtw_pwr_wakeup(padapter) == _FAIL))

			return -EFAULT;

	} else {

		return -EINVAL;