Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git] / drivers / staging / rtl8723bs / core / rtw_cmd.c
index 8e69f9c..bd24d91 100644 (file)
@@ -166,7 +166,8 @@ int rtw_init_cmd_priv(struct        cmd_priv *pcmdpriv)
        init_completion(&pcmdpriv->cmd_queue_comp);
        init_completion(&pcmdpriv->terminate_cmdthread_comp);
 
-       _rtw_init_queue(&(pcmdpriv->cmd_queue));
+       INIT_LIST_HEAD(&pcmdpriv->cmd_queue.queue);
+       spin_lock_init(&pcmdpriv->cmd_queue.lock);
 
        /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
 
@@ -255,7 +256,7 @@ int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj)
 {
        unsigned long irqL;
 
-       if (obj == NULL)
+       if (!obj)
                goto exit;
 
        /* spin_lock_bh(&queue->lock); */
@@ -277,10 +278,10 @@ struct    cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)
 
        /* spin_lock_bh(&(queue->lock)); */
        spin_lock_irqsave(&queue->lock, irqL);
-       if (list_empty(&(queue->queue)))
+       if (list_empty(&queue->queue))
                obj = NULL;
        else {
-               obj = container_of(get_next(&(queue->queue)), struct cmd_obj, list);
+               obj = container_of(get_next(&queue->queue), struct cmd_obj, list);
                list_del_init(&obj->list);
        }
 
@@ -308,22 +309,19 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
        if (cmd_obj->cmdcode == GEN_CMD_CODE(_SetChannelPlan))
                bAllow = true;
 
-       if ((pcmdpriv->padapter->hw_init_completed == false && bAllow == false)
-               || atomic_read(&(pcmdpriv->cmdthd_running)) == false    /* com_thread not running */
-       )
+       if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) ||
+               !atomic_read(&pcmdpriv->cmdthd_running))        /* com_thread not running */
                return _FAIL;
 
        return _SUCCESS;
 }
 
-
-
 int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
 {
        int res = _FAIL;
        struct adapter *padapter = pcmdpriv->padapter;
 
-       if (cmd_obj == NULL)
+       if (!cmd_obj)
                goto exit;
 
        cmd_obj->padapter = padapter;
@@ -367,11 +365,10 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd)
        kfree(pcmd);
 }
 
-
 void rtw_stop_cmd_thread(struct adapter *adapter)
 {
        if (adapter->cmdThread &&
-               atomic_read(&(adapter->cmdpriv.cmdthd_running)) == true &&
+               atomic_read(&adapter->cmdpriv.cmdthd_running) &&
                adapter->cmdpriv.stop_req == 0) {
                adapter->cmdpriv.stop_req = 1;
                complete(&adapter->cmdpriv.cmd_queue_comp);
@@ -387,7 +384,7 @@ int rtw_cmd_thread(void *context)
        u8 (*cmd_hdl)(struct adapter *padapter, u8 *pbuf);
        void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
        struct adapter *padapter = context;
-       struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
+       struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        struct drvextra_cmd_parm *extra_parm = NULL;
 
        thread_enter("RTW_CMD_THREAD");
@@ -395,7 +392,7 @@ int rtw_cmd_thread(void *context)
        pcmdbuf = pcmdpriv->cmd_buf;
 
        pcmdpriv->stop_req = 0;
-       atomic_set(&(pcmdpriv->cmdthd_running), true);
+       atomic_set(&pcmdpriv->cmdthd_running, true);
        complete(&pcmdpriv->terminate_cmdthread_comp);
 
        while (1) {
@@ -406,7 +403,7 @@ int rtw_cmd_thread(void *context)
                        break;
                }
 
-               if ((padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true)) {
+               if (padapter->bDriverStopped || padapter->bSurpriseRemoved) {
                        netdev_dbg(padapter->pnetdev,
                                   "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
                                   __func__, padapter->bDriverStopped,
@@ -429,7 +426,7 @@ int rtw_cmd_thread(void *context)
                        continue;
 
 _next:
-               if ((padapter->bDriverStopped == true) || (padapter->bSurpriseRemoved == true)) {
+               if (padapter->bDriverStopped || padapter->bSurpriseRemoved) {
                        netdev_dbg(padapter->pnetdev,
                                   "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
                                   __func__, padapter->bDriverStopped,
@@ -471,7 +468,7 @@ _next:
 
 post_process:
 
-               if (mutex_lock_interruptible(&(pcmd->padapter->cmdpriv.sctx_mutex)) == 0) {
+               if (mutex_lock_interruptible(&pcmd->padapter->cmdpriv.sctx_mutex) == 0) {
                        if (pcmd->sctx) {
                                netdev_dbg(padapter->pnetdev,
                                           FUNC_ADPT_FMT " pcmd->sctx\n",
@@ -482,13 +479,13 @@ post_process:
                                else
                                        rtw_sctx_done_err(&pcmd->sctx, RTW_SCTX_DONE_CMD_ERROR);
                        }
-                       mutex_unlock(&(pcmd->padapter->cmdpriv.sctx_mutex));
+                       mutex_unlock(&pcmd->padapter->cmdpriv.sctx_mutex);
                }
 
                /* call callback function for post-processed */
                if (pcmd->cmdcode < ARRAY_SIZE(rtw_cmd_callback)) {
                        pcmd_callback = rtw_cmd_callback[pcmd->cmdcode].callback;
-                       if (pcmd_callback == NULL) {
+                       if (!pcmd_callback) {
                                rtw_free_cmd_obj(pcmd);
                        } else {
                                /* todo: !!! fill rsp_buf to pcmd->rsp if (pcmd->rsp!= NULL) */
@@ -497,17 +494,14 @@ post_process:
                } else {
                        rtw_free_cmd_obj(pcmd);
                }
-
                flush_signals_thread();
-
                goto _next;
-
        }
 
        /*  free all cmd_obj resources */
        do {
                pcmd = rtw_dequeue_cmd(pcmdpriv);
-               if (pcmd == NULL) {
+               if (!pcmd) {
                        rtw_unregister_cmd_alive(padapter);
                        break;
                }
@@ -522,7 +516,7 @@ post_process:
        } while (1);
 
        complete(&pcmdpriv->terminate_cmdthread_comp);
-       atomic_set(&(pcmdpriv->cmdthd_running), false);
+       atomic_set(&pcmdpriv->cmdthd_running, false);
 
        return 0;
 }
@@ -542,15 +536,15 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
        struct cmd_priv         *pcmdpriv = &padapter->cmdpriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
+       if (check_fwstate(pmlmepriv, _FW_LINKED))
                rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL)
+       if (!ph2c)
                return _FAIL;
 
        psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
-       if (psurveyPara == NULL) {
+       if (!psurveyPara) {
                kfree(ph2c);
                return _FAIL;
        }
@@ -591,7 +585,6 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 
        if (res == _SUCCESS) {
-
                pmlmepriv->scan_start_time = jiffies;
                _set_timer(&pmlmepriv->scan_to_timer, SCANNING_TIMEOUT);
        } else {
@@ -608,13 +601,13 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pbsetdataratepara = rtw_zmalloc(sizeof(struct setdatarate_parm));
-       if (pbsetdataratepara == NULL) {
+       if (!pbsetdataratepara) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -644,7 +637,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
        u8 res = _SUCCESS;
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd == NULL) {
+       if (!pcmd) {
                res = _FAIL;
                goto exit;
        }
@@ -677,7 +670,7 @@ int rtw_startbss_cmd(struct adapter  *padapter, int flags)
        } else {
                /* need enqueue, prepare cmd_obj and enqueue */
                pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (pcmd == NULL) {
+               if (!pcmd) {
                        res = _FAIL;
                        goto exit;
                }
@@ -724,12 +717,12 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
        enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.infrastructure_mode;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
-       struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
+       struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
        u32 tmp_len;
        u8 *ptmp = NULL;
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd == NULL) {
+       if (!pcmd) {
                res = _FAIL;
                goto exit;
        }
@@ -752,7 +745,6 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
                case Ndis802_11AutoUnknown:
                case Ndis802_11InfrastructureMax:
                        break;
-
                }
        }
 
@@ -775,7 +767,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        /*  If not,  we have to copy the connecting AP's MAC address to it so that */
        /*  the driver just has the bssid information for PMKIDList searching. */
 
-       if (pmlmepriv->assoc_by_bssid == false)
+       if (!pmlmepriv->assoc_by_bssid)
                memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.mac_address[0], ETH_ALEN);
 
        psecnetwork->ie_length = rtw_restruct_sec_ie(padapter, &pnetwork->network.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length);
@@ -841,7 +833,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 
        /* prepare cmd parameter */
        param = rtw_zmalloc(sizeof(*param));
-       if (param == NULL) {
+       if (!param) {
                res = _FAIL;
                goto exit;
        }
@@ -850,7 +842,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
        if (enqueue) {
                /* need enqueue, prepare cmd_obj and enqueue */
                cmdobj = rtw_zmalloc(sizeof(*cmdobj));
-               if (cmdobj == NULL) {
+               if (!cmdobj) {
                        res = _FAIL;
                        kfree(param);
                        goto exit;
@@ -878,7 +870,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrast
 
        psetop = rtw_zmalloc(sizeof(struct setopmode_parm));
 
-       if (psetop == NULL) {
+       if (!psetop) {
                res = _FAIL;
                goto exit;
        }
@@ -886,7 +878,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrast
 
        if (enqueue) {
                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (ph2c == NULL) {
+               if (!ph2c) {
                        kfree(psetop);
                        res = _FAIL;
                        goto exit;
@@ -914,7 +906,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
        u8 res = _SUCCESS;
 
        psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
-       if (psetstakey_para == NULL) {
+       if (!psetstakey_para) {
                res = _FAIL;
                goto exit;
        }
@@ -922,11 +914,11 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
        memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN);
 
        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-               psetstakey_para->algorithm = (unsigned char) psecuritypriv->dot11PrivacyAlgrthm;
+               psetstakey_para->algorithm = (unsigned char)psecuritypriv->dot11PrivacyAlgrthm;
        else
                GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false);
 
-       if (unicast_key == true)
+       if (unicast_key)
                memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16);
        else
                memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey, 16);
@@ -936,14 +928,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
 
        if (enqueue) {
                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (ph2c == NULL) {
+               if (!ph2c) {
                        kfree(psetstakey_para);
                        res = _FAIL;
                        goto exit;
                }
 
                psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
-               if (psetstakey_rsp == NULL) {
+               if (!psetstakey_rsp) {
                        kfree(ph2c);
                        kfree(psetstakey_para);
                        res = _FAIL;
@@ -951,7 +943,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
                }
 
                init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_);
-               ph2c->rsp = (u8 *) psetstakey_rsp;
+               ph2c->rsp = (u8 *)psetstakey_rsp;
                ph2c->rspsz = sizeof(struct set_stakey_rsp);
                res = rtw_enqueue_cmd(pcmdpriv, ph2c);
        } else {
@@ -981,20 +973,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
                }
        } else {
                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (ph2c == NULL) {
+               if (!ph2c) {
                        res = _FAIL;
                        goto exit;
                }
 
                psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
-               if (psetstakey_para == NULL) {
+               if (!psetstakey_para) {
                        kfree(ph2c);
                        res = _FAIL;
                        goto exit;
                }
 
                psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
-               if (psetstakey_rsp == NULL) {
+               if (!psetstakey_rsp) {
                        kfree(ph2c);
                        kfree(psetstakey_para);
                        res = _FAIL;
@@ -1002,7 +994,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
                }
 
                init_h2fwcmd_w_parm_no_rsp(ph2c, psetstakey_para, _SetStaKey_CMD_);
-               ph2c->rsp = (u8 *) psetstakey_rsp;
+               ph2c->rsp = (u8 *)psetstakey_rsp;
                ph2c->rspsz = sizeof(struct set_stakey_rsp);
 
                memcpy(psetstakey_para->addr, sta->hwaddr, ETH_ALEN);
@@ -1010,9 +1002,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
                psetstakey_para->algorithm = _NO_PRIVACY_;
 
                res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-
        }
-
 exit:
        return res;
 }
@@ -1026,13 +1016,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        paddbareq_parm = rtw_zmalloc(sizeof(struct addBaReq_parm));
-       if (paddbareq_parm == NULL) {
+       if (!paddbareq_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1058,13 +1048,13 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1080,7 +1070,6 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter)
 
        /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-
 exit:
        return res;
 }
@@ -1093,13 +1082,13 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1112,10 +1101,8 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter)
 
        init_h2fwcmd_w_parm_no_rsp(ph2c, pdrvextra_cmd_parm, GEN_CMD_CODE(_Set_Drv_Extra));
 
-
        /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-
 exit:
        return res;
 }
@@ -1129,13 +1116,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
 
        /* only  primary padapter does this cmd */
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1150,7 +1137,6 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
 
        /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
-
 exit:
        return res;
 }
@@ -1164,7 +1150,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
        u8 res = _SUCCESS;
 
        /*  check if allow software config */
-       if (swconfig && rtw_hal_is_disable_sw_channel_plan(padapter) == true) {
+       if (swconfig && rtw_hal_is_disable_sw_channel_plan(padapter)) {
                res = _FAIL;
                goto exit;
        }
@@ -1177,7 +1163,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
 
        /* prepare cmd parameter */
        setChannelPlan_param = rtw_zmalloc(sizeof(struct SetChannelPlan_param));
-       if (setChannelPlan_param == NULL) {
+       if (!setChannelPlan_param) {
                res = _FAIL;
                goto exit;
        }
@@ -1186,7 +1172,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
        if (enqueue) {
                /* need enqueue, prepare cmd_obj and enqueue */
                pcmdobj = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (pcmdobj == NULL) {
+               if (!pcmdobj) {
                        kfree(setChannelPlan_param);
                        res = _FAIL;
                        goto exit;
@@ -1243,14 +1229,14 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
        u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
        u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false;
 
-       struct mlme_priv        *pmlmepriv = &(padapter->mlmepriv);
+       struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
 
        collect_traffic_statistics(padapter);
 
        /*  */
        /*  Determine if our traffic is busy now */
        /*  */
-       if ((check_fwstate(pmlmepriv, _FW_LINKED) == true)
+       if ((check_fwstate(pmlmepriv, _FW_LINKED))
                /*&& !MgntInitAdapterInProgress(pMgntInfo)*/) {
                /*  if we raise bBusyTraffic in last watchdog, using lower threshold. */
                if (pmlmepriv->LinkDetectInfo.bBusyTraffic)
@@ -1282,7 +1268,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
                        (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) {
                        bEnterPS = false;
 
-                       if (bBusyTraffic == true) {
+                       if (bBusyTraffic) {
                                if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <= 4)
                                        pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 4;
 
@@ -1315,7 +1301,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer)
                struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
                int n_assoc_iface = 0;
 
-               if (check_fwstate(&(dvobj->padapters->mlmepriv), WIFI_ASOC_STATE))
+               if (check_fwstate(&dvobj->padapters->mlmepriv, WIFI_ASOC_STATE))
                        n_assoc_iface++;
 
                if (!from_timer && n_assoc_iface == 0)
@@ -1340,21 +1326,18 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter)
 {
        struct mlme_priv *pmlmepriv;
 
-       pmlmepriv = &(padapter->mlmepriv);
+       pmlmepriv = &padapter->mlmepriv;
 
-       if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
+       if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
                expire_timeout_chk(padapter);
 
        /* for debug purpose */
        _linked_info_dump(padapter);
-
-
        /* if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING|_FW_UNDER_SURVEY) ==false) */
        {
                linked_status_chk(padapter);
                traffic_status_watchdog(padapter, 0);
        }
-
        rtw_hal_dm_watchdog(padapter);
 
        /* check_hw_pbc(padapter, pdrvextra_cmd->pbuf, pdrvextra_cmd->type); */
@@ -1374,11 +1357,11 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);
 void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
 {
        struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
-       struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
+       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        u8 mstatus;
 
-       if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)
-               || (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true)) {
+       if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) ||
+               check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
                return;
        }
 
@@ -1386,7 +1369,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
        case LPS_CTRL_SCAN:
                hal_btcoex_ScanNotify(padapter, true);
 
-               if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
+               if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                        /*  connect */
                        LPS_Leave(padapter, "LPS_CTRL_SCAN");
                }
@@ -1436,13 +1419,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
 
        if (enqueue) {
                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (ph2c == NULL) {
+               if (!ph2c) {
                        res = _FAIL;
                        goto exit;
                }
 
                pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-               if (pdrvextra_cmd_parm == NULL) {
+               if (!pdrvextra_cmd_parm) {
                        kfree(ph2c);
                        res = _FAIL;
                        goto exit;
@@ -1478,13 +1461,13 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter)
 
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1500,9 +1483,7 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter)
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 
 exit:
-
        return res;
-
 }
 
 static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)
@@ -1512,7 +1493,7 @@ static void rtw_lps_change_dtim_hdl(struct adapter *padapter, u8 dtim)
        if (dtim <= 0 || dtim > 16)
                return;
 
-       if (hal_btcoex_IsBtControlLps(padapter) == true)
+       if (hal_btcoex_IsBtControlLps(padapter))
                return;
 
        mutex_lock(&pwrpriv->lock);
@@ -1542,15 +1523,14 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1577,15 +1557,14 @@ u8 rtw_ps_cmd(struct adapter *padapter)
        struct drvextra_cmd_parm        *pdrvextra_cmd_parm;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
-
        ppscmd = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ppscmd == NULL) {
+       if (!ppscmd) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ppscmd);
                res = _FAIL;
                goto exit;
@@ -1618,7 +1597,7 @@ static void rtw_chk_hi_queue_hdl(struct adapter *padapter)
 
        rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &empty);
 
-       while (false == empty && jiffies_to_msecs(jiffies - start) < g_wait_hiq_empty) {
+       while (!empty && jiffies_to_msecs(jiffies - start) < g_wait_hiq_empty) {
                msleep(100);
                rtw_hal_get_hwreg(padapter, HW_VAR_CHK_HI_QUEUE_EMPTY, &empty);
        }
@@ -1651,13 +1630,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1673,9 +1652,7 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
        res = rtw_enqueue_cmd(pcmdpriv, ph2c);
 
 exit:
-
        return res;
-
 }
 
 struct btinfo {
@@ -1745,13 +1722,13 @@ u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1780,13 +1757,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
-       if (pdrvextra_cmd_parm == NULL) {
+       if (!pdrvextra_cmd_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1840,7 +1817,7 @@ static void c2h_wk_callback(struct work_struct *work)
                        continue;
                }
 
-               if (ccx_id_filter(c2h_evt) == true) {
+               if (ccx_id_filter(c2h_evt)) {
                        /* Handle CCX report here */
                        rtw_hal_c2h_handler(adapter, c2h_evt);
                        kfree(c2h_evt);
@@ -1959,9 +1936,9 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
        struct wlan_network *pwlan = NULL;
        struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
-       struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
+       struct wlan_network *tgt_network = &pmlmepriv->cur_network;
 
-       if (pcmd->parmbuf == NULL)
+       if (!pcmd->parmbuf)
                goto exit;
 
        if (pcmd->res != H2C_SUCCESS)
@@ -1983,20 +1960,20 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
                rtw_indicate_connect(padapter);
        } else {
                pwlan = rtw_alloc_network(pmlmepriv);
-               spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
-               if (pwlan == NULL) {
+               spin_lock_bh(&pmlmepriv->scanned_queue.lock);
+               if (!pwlan) {
                        pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
-                       if (pwlan == NULL) {
-                               spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
+                       if (!pwlan) {
+                               spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
                                goto createbss_cmd_fail;
                        }
                        pwlan->last_scanned = jiffies;
                } else {
-                       list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue);
+                       list_add_tail(&pwlan->list, &pmlmepriv->scanned_queue.queue);
                }
 
                pnetwork->length = get_wlan_bssid_ex_sz(pnetwork);
-               memcpy(&(pwlan->network), pnetwork, pnetwork->length);
+               memcpy(&pwlan->network, pnetwork, pnetwork->length);
                /* pwlan->fixed = true; */
 
                /* list_add_tail(&(pwlan->list), &pmlmepriv->scanned_queue.queue); */
@@ -2009,7 +1986,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
 
                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
 
-               spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
+               spin_unlock_bh(&pmlmepriv->scanned_queue.lock);
                /*  we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */
 
        }
@@ -2021,13 +1998,10 @@ exit:
        rtw_free_cmd_obj(pcmd);
 }
 
-
-
 void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
 {
-
        struct sta_priv *pstapriv = &padapter->stapriv;
-       struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *) (pcmd->rsp);
+       struct set_stakey_rsp *psetstakey_rsp = (struct set_stakey_rsp *)(pcmd->rsp);
        struct sta_info *psta = rtw_get_stainfo(pstapriv, psetstakey_rsp->addr);
 
        if (!psta)
@@ -2042,7 +2016,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct set_assocsta_parm *passocsta_parm = (struct set_assocsta_parm *)(pcmd->parmbuf);
-       struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *) (pcmd->rsp);
+       struct set_assocsta_rsp *passocsta_rsp = (struct set_assocsta_rsp *)(pcmd->rsp);
        struct sta_info *psta = rtw_get_stainfo(pstapriv, passocsta_parm->addr);
 
        if (!psta)
@@ -2053,7 +2027,7 @@ void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *
 
        spin_lock_bh(&pmlmepriv->lock);
 
-       if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) && (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true))
+       if (check_fwstate(pmlmepriv, WIFI_MP_STATE) && check_fwstate(pmlmepriv, _FW_UNDER_LINKING))
                _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
 
        set_fwstate(pmlmepriv, _FW_LINKED);