staging: rtl8188eu: clean up comparsion style issues

Move constants to the right side of comparsions to follow kernel
coding style and clear checkpatch warnings. In case of comparsion
to _FAIL we can use '!' since _FAIL is defined as '0'.

WARNING: Comparisons should place the constant on the right side of the test

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200917071330.31740-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index dad007f78d8c84d89d315cb8497c03eabfeeeb55..4df790c83d9f0b75129422ecda3472e658af4636 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -2981,7 +2981,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                        status = _STATS_FAILURE_;
        }
 
-       if (_STATS_SUCCESSFUL_ != status)
+       if (status != _STATS_SUCCESSFUL_)
                goto OnAssocReqFail;
 
        /*  check if the supported rate is ok */
@@ -3072,7 +3072,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
                wpa_ie_len = 0;
        }
 
-       if (_STATS_SUCCESSFUL_ != status)
+       if (status != _STATS_SUCCESSFUL_)
                goto OnAssocReqFail;
 
        pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
@@ -3282,7 +3282,7 @@ static unsigned int OnAssocReq(struct adapter *padapter,
        spin_unlock_bh(&pstapriv->asoc_list_lock);
 
        /*  now the station is qualified to join our BSS... */
-       if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (_STATS_SUCCESSFUL_ == status)) {
+       if ((pstat->state & WIFI_FW_ASSOC_SUCCESS) && (status == _STATS_SUCCESSFUL_)) {
                /* 1 bss_cap_update & sta_info_update */
                bss_cap_update_on_sta_join(padapter, pstat);
                sta_info_update(padapter, pstat);

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index d6c4c7d023d112c3182f6260300782cb3fa14697..4d659a812aede8afbd8955478af22edfc972a1a5 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -829,9 +829,9 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate
        }
 
        /*  Decide RATRState by RSSI. */
-       if (RSSI > HighRSSIThreshForRA)
+       if (HighRSSIThreshForRA < RSSI)
                RATRState = DM_RATR_STA_HIGH;
-       else if (RSSI > LowRSSIThreshForRA)
+       else if (LowRSSIThreshForRA < RSSI)
                RATRState = DM_RATR_STA_MIDDLE;
        else
                RATRState = DM_RATR_STA_LOW;

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index e640c2256ab932bc7fabd698899191f315904c19..6e131202fde5a2619458b884c9cb9d0176a906c1 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -187,7 +187,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
        /* polling */
        do {
                value = usb_read32(padapter, LLTReg);
-               if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value))
+               if (_LLT_OP_VALUE(value) == _LLT_NO_ACTIVE)
                        break;
 
                if (count > POLLING_LLT_THRESHOLD) {

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 010f0c42368ac8842f7bb1c487572591e0057d3c..1b74b32b8a81ec99aeeace74c6a5d4c08d946c35 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -266,7 +266,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state)
 {
        pmlmepriv->fw_state |= state;
        /* FOR HW integration */
-       if (_FW_UNDER_SURVEY == state)
+       if (state == _FW_UNDER_SURVEY)
                pmlmepriv->bScanInProcess = true;
 }
 
@@ -274,7 +274,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state)
 {
        pmlmepriv->fw_state &= ~state;
        /* FOR HW integration */
-       if (_FW_UNDER_SURVEY == state)
+       if (state == _FW_UNDER_SURVEY)
                pmlmepriv->bScanInProcess = false;
 }
 

diff --git a/drivers/staging/rtl8188eu/include/wifi.h b/drivers/staging/rtl8188eu/include/wifi.h
index 118e215dd6b191e2c53494fd5fc7d1cde79a1be4..a549b6d0159a29b1380b983568c6147a5504abf3 100644 (file)
--- a/drivers/staging/rtl8188eu/include/wifi.h
+++ b/drivers/staging/rtl8188eu/include/wifi.h
@@ -326,7 +326,7 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 
 static inline int IsFrameTypeCtrl(unsigned char *pframe)
 {
-       if (WIFI_CTRL_TYPE == GetFrameType(pframe))
+       if (GetFrameType(pframe) == WIFI_CTRL_TYPE)
                return true;
        else
                return false;

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index d10a078c5b4958e8ce10e4c9b7eca18c83aec197..ba6356e0825a50c531df156d1fb89ede5dbead8d 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -694,7 +694,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
        enum ndis_802_11_network_infra networkType;
        int ret = 0;
 
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (!rtw_pwr_wakeup(padapter)) {
                ret = -EPERM;
                goto exit;
        }
@@ -946,7 +946,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
        struct  wlan_network    *pnetwork = NULL;
        enum ndis_802_11_auth_mode      authmode;
 
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (!rtw_pwr_wakeup(padapter)) {
                ret = -1;
                goto exit;
        }
@@ -1065,7 +1065,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 
        RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("%s\n", __func__));
 
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (!rtw_pwr_wakeup(padapter)) {
                ret = -1;
                goto exit;
        }
@@ -1269,7 +1269,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
 
        RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_info_,
                 ("+%s: fw_state = 0x%08x\n", __func__, get_fwstate(pmlmepriv)));
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (!rtw_pwr_wakeup(padapter)) {
                ret = -1;
                goto exit;
        }
@@ -2878,7 +2878,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
                int probereq_wpsie_len = len;
                u8 wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};
 
-               if ((_VENDOR_SPECIFIC_IE_ == probereq_wpsie[0]) &&
+               if ((probereq_wpsie[0] == _VENDOR_SPECIFIC_IE_) &&
                    (!memcmp(&probereq_wpsie[2], wps_oui, 4))) {
                        cp_sz = min(probereq_wpsie_len, MAX_WPS_IE_LEN);