These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / hal / Hal8188ERateAdaptive.c

diff --git a/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c b/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
index 082f0ca..a108e80 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
+++ b/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
@@ -87,7 +87,7 @@ static u8 DROPING_NECESSARY[RATESIZE] = {
 
 static u8 PendingForRateUpFail[5] = {2, 10, 24, 40, 60};
 static u16 DynamicTxRPTTiming[6] = {
-       0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12 , 0x927c}; /*  200ms-1200ms */
+       0x186a, 0x30d4, 0x493e, 0x61a8, 0x7a12, 0x927c}; /*  200ms-1200ms */
 
 /*  End Rate adaptive parameters */
 
@@ -127,7 +127,7 @@ static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm,
 
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,
                        ODM_DBG_TRACE, ("=====>odm_RateDown_8188E()\n"));
-       if (NULL == pRaInfo) {
+       if (!pRaInfo) {
                ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
                                ("odm_RateDown_8188E(): pRaInfo is NULL\n"));
                return -1;
@@ -193,7 +193,7 @@ static int odm_RateUp_8188E(
 
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,
                        ODM_DBG_TRACE, ("=====>odm_RateUp_8188E()\n"));
-       if (NULL == pRaInfo) {
+       if (!pRaInfo) {
                ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
                                ("odm_RateUp_8188E(): pRaInfo is NULL\n"));
                return -1;
@@ -624,7 +624,7 @@ int ODM_RAInfo_Init_all(struct odm_dm_struct *dm_odm)
 
 u8 ODM_RA_GetShortGI_8188E(struct odm_dm_struct *dm_odm, u8 macid)
 {
-       if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
+       if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
                return 0;
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
                     ("macid =%d SGI =%d\n", macid, dm_odm->RAInfo[macid].RateSGI));
@@ -635,7 +635,7 @@ u8 ODM_RA_GetDecisionRate_8188E(struct odm_dm_struct *dm_odm, u8 macid)
 {
        u8 DecisionRate = 0;
 
-       if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
+       if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
                return 0;
        DecisionRate = dm_odm->RAInfo[macid].DecisionRate;
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
@@ -647,7 +647,7 @@ u8 ODM_RA_GetHwPwrStatus_8188E(struct odm_dm_struct *dm_odm, u8 macid)
 {
        u8 PTStage = 5;
 
-       if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
+       if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
                return 0;
        PTStage = dm_odm->RAInfo[macid].PTStage;
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
@@ -659,11 +659,11 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate
 {
        struct odm_ra_info *pRaInfo = NULL;
 
+       if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
+               return;
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
                     ("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n",
                     macid, RateID, RateMask, SGIEnable));
-       if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
-               return;
 
        pRaInfo = &(dm_odm->RAInfo[macid]);
        pRaInfo->RateID = RateID;
@@ -676,10 +676,10 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi)
 {
        struct odm_ra_info *pRaInfo = NULL;
 
+       if ((!dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
+               return;
        ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,
                     (" macid =%d Rssi =%d\n", macid, Rssi));
-       if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))
-               return;
 
        pRaInfo = &(dm_odm->RAInfo[macid]);
        pRaInfo->RssiStaRA = Rssi;