staging: rtl8723bs: clean up comparsions to NULL

[ Upstream commit cd1f1450092216b3e39516f8db58869b6fc20575 ]

Clean up comparsions to NULL reported by checkpatch.

x == NULL -> !x
x != NULL -> x

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210829154533.11054-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 05cbcc415c9b ("staging: rtl8723bs: Fix key-store index handling")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index 6064dd6a76b421772694bf2ee332abe92d4d6d4a..674592e914e26a265b2ce37699fbbae7744c633c 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -891,7 +891,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
                &ie_len,
                (pbss_network->ie_length - _BEACON_IE_OFFSET_)
        );
-       if (p !=  NULL) {
+       if (p) {
                memcpy(supportRate, p + 2, ie_len);
                supportRateNum = ie_len;
        }
@@ -903,7 +903,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
                &ie_len,
                pbss_network->ie_length - _BEACON_IE_OFFSET_
        );
-       if (p !=  NULL) {
+       if (p) {
                memcpy(supportRate + supportRateNum, p + 2, ie_len);
                supportRateNum += ie_len;
        }
@@ -991,7 +991,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
                        break;
                }
 
-               if ((p == NULL) || (ie_len == 0))
+               if (!p || ie_len == 0)
                        break;
        }
 
@@ -1021,7 +1021,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
                                break;
                        }
 
-                       if ((p == NULL) || (ie_len == 0))
+                       if (!p || ie_len == 0)
                                break;
                }
        }
@@ -1145,7 +1145,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf,  int len)
        psta = rtw_get_stainfo(&padapter->stapriv, pbss_network->mac_address);
        if (!psta) {
                psta = rtw_alloc_stainfo(&padapter->stapriv, pbss_network->mac_address);
-               if (psta == NULL)
+               if (!psta)
                        return _FAIL;
        }
 
@@ -1275,7 +1275,7 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
        }
 
        psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
-       if (psetstakey_para == NULL) {
+       if (!psetstakey_para) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -1311,12 +1311,12 @@ static int rtw_ap_set_key(
        int res = _SUCCESS;
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd == NULL) {
+       if (!pcmd) {
                res = _FAIL;
                goto exit;
        }
        psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
-       if (psetkeyparm == NULL) {
+       if (!psetkeyparm) {
                kfree(pcmd);
                res = _FAIL;
                goto exit;
@@ -1474,11 +1474,11 @@ static void update_bcn_wps_ie(struct adapter *padapter)
                &wps_ielen
        );
 
-       if (pwps_ie == NULL || wps_ielen == 0)
+       if (!pwps_ie || wps_ielen == 0)
                return;
 
        pwps_ie_src = pmlmepriv->wps_beacon_ie;
-       if (pwps_ie_src == NULL)
+       if (!pwps_ie_src)
                return;
 
        wps_offset = (uint)(pwps_ie - ie);

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 93e3a4c9e1159b368f3705fb743c437478038d9e..5f4f603b3b3662a00c40c28c08ead75ea211a104 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -251,7 +251,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); */
@@ -319,7 +319,7 @@ 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;
@@ -484,7 +484,7 @@ post_process:
                /* 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) */
@@ -503,7 +503,7 @@ post_process:
        /*  free all cmd_obj resources */
        do {
                pcmd = rtw_dequeue_cmd(pcmdpriv);
-               if (pcmd == NULL) {
+               if (!pcmd) {
                        rtw_unregister_cmd_alive(padapter);
                        break;
                }
@@ -542,11 +542,11 @@ u8 rtw_sitesurvey_cmd(struct adapter  *padapter, struct ndis_802_11_ssid *ssid,
                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;
        }
@@ -604,13 +604,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;
@@ -640,7 +640,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;
        }
@@ -673,7 +673,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;
                }
@@ -725,7 +725,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        u8 *ptmp = NULL;
 
        pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd == NULL) {
+       if (!pcmd) {
                res = _FAIL;
                goto exit;
        }
@@ -837,7 +837,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;
        }
@@ -846,7 +846,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;
@@ -874,7 +874,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;
        }
@@ -882,7 +882,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;
@@ -910,7 +910,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;
        }
@@ -932,14 +932,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;
@@ -977,20 +977,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;
@@ -1022,13 +1022,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;
@@ -1054,13 +1054,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;
@@ -1089,13 +1089,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;
@@ -1125,13 +1125,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;
@@ -1173,7 +1173,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;
        }
@@ -1182,7 +1182,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;
@@ -1432,13 +1432,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;
@@ -1474,13 +1474,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;
@@ -1540,13 +1540,13 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta)
 
 
        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;
@@ -1575,13 +1575,13 @@ u8 rtw_ps_cmd(struct adapter *padapter)
        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;
@@ -1647,13 +1647,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;
@@ -1741,13 +1741,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;
@@ -1776,13 +1776,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;
@@ -1957,7 +1957,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
        struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
        struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
 
-       if (pcmd->parmbuf == NULL)
+       if (!pcmd->parmbuf)
                goto exit;
 
        if (pcmd->res != H2C_SUCCESS)
@@ -1980,9 +1980,9 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
        } else {
                pwlan = rtw_alloc_network(pmlmepriv);
                spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
-               if (pwlan == NULL) {
+               if (!pwlan) {
                        pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);
-                       if (pwlan == NULL) {
+                       if (!pwlan) {
                                spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
                                goto createbss_cmd_fail;
                        }

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index 5cfde71766173fd89e0b464c50cfed8d5016bf83..8c11daff2d59026553274efc67d074e117b0dd60 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -370,7 +370,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s
        struct  mlme_priv       *pmlmepriv = &padapter->mlmepriv;
        u8 res = true;
 
-       if (padapter == NULL) {
+       if (!padapter) {
                res = false;
                goto exit;
        }
@@ -481,7 +481,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)
                return 0;
 
        psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));
-       if (psta == NULL)
+       if (!psta)
                return 0;
 
        short_GI = query_ra_short_GI(psta);

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 952c3e14d1b338f07c3f0494c529b72595c4824e..26c40042d2bed90897ffcd89e3e3e5cd329fc04d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -439,7 +439,7 @@ struct      wlan_network    *rtw_get_oldest_wlan_network(struct __queue *scanned_queue)
                pwlan = list_entry(plist, struct wlan_network, list);
 
                if (!pwlan->fixed) {
-                       if (oldest == NULL || time_after(oldest->last_scanned, pwlan->last_scanned))
+                       if (!oldest || time_after(oldest->last_scanned, pwlan->last_scanned))
                                oldest = pwlan;
                }
        }
@@ -542,7 +542,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
                        /* TODO: don't select network in the same ess as oldest if it's new enough*/
                }
 
-               if (oldest == NULL || time_after(oldest->last_scanned, pnetwork->last_scanned))
+               if (!oldest || time_after(oldest->last_scanned, pnetwork->last_scanned))
                        oldest = pnetwork;
 
        }
@@ -1816,7 +1816,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme
                        goto exit;
        }
 
-       if (*candidate == NULL || (*candidate)->network.rssi < competitor->network.rssi) {
+       if (!*candidate || (*candidate)->network.rssi < competitor->network.rssi) {
                *candidate = competitor;
                updated = true;
        }

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 1a4b4c75c4bf5117eddf7a1ac0973d1463012965..e923f306cf0c34595ada0414dabb8a59ecfec07d 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -742,11 +742,11 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
        }
 
        pstat = rtw_get_stainfo(pstapriv, sa);
-       if (pstat == NULL) {
+       if (!pstat) {
 
                /*  allocate a new one */
                pstat = rtw_alloc_stainfo(pstapriv, sa);
-               if (pstat == NULL) {
+               if (!pstat) {
                        status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
                        goto auth_fail;
                }
@@ -814,7 +814,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
                        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&ie_len,
                                        len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
 
-                       if ((p == NULL) || (ie_len <= 0)) {
+                       if (!p || ie_len <= 0) {
                                status = WLAN_STATUS_CHALLENGE_FAIL;
                                goto auth_fail;
                        }
@@ -1034,7 +1034,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 
        /*  check if the supported rate is ok */
        p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_SUPP_RATES, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset);
-       if (p == NULL) {
+       if (!p) {
                /*  use our own rate set as statoin used */
                /* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */
                /* supportRateNum = AP_BSSRATE_LEN; */
@@ -1047,7 +1047,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 
                p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_EXT_SUPP_RATES, &ie_len,
                                pkt_len - WLAN_HDR_A3_LEN - ie_offset);
-               if (p !=  NULL) {
+               if (p) {
 
                        if (supportRateNum <= sizeof(supportRate)) {
                                memcpy(supportRate+supportRateNum, p+2, ie_len);
@@ -1294,7 +1294,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
        /* get a unique AID */
        if (pstat->aid == 0) {
                for (pstat->aid = 1; pstat->aid <= NUM_STA; pstat->aid++)
-                       if (pstapriv->sta_aid[pstat->aid - 1] == NULL)
+                       if (!pstapriv->sta_aid[pstat->aid - 1])
                                break;
 
                /* if (pstat->aid > NUM_STA) { */
@@ -1940,7 +1940,7 @@ static struct xmit_frame *_alloc_mgtxmitframe(struct xmit_priv *pxmitpriv, bool
                goto exit;
 
        pxmitbuf = rtw_alloc_xmitbuf_ext(pxmitpriv);
-       if (pxmitbuf == NULL) {
+       if (!pxmitbuf) {
                rtw_free_xmitframe(pxmitpriv, pmgntframe);
                pmgntframe = NULL;
                goto exit;
@@ -2293,7 +2293,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
        struct wlan_bssid_ex            *cur_network = &(pmlmeinfo->network);
        unsigned int    rate_len;
 
-       if (da == NULL)
+       if (!da)
                return;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@@ -2617,7 +2617,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
        __le16 le_tmp;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL)
+       if (!pmgntframe)
                return;
 
        /* update attribute */
@@ -2748,7 +2748,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
        __le16 lestatus, le_tmp;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL)
+       if (!pmgntframe)
                return;
 
        /* update attribute */
@@ -2836,7 +2836,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i
                                break;
                        }
 
-                       if ((pbuf == NULL) || (ie_len == 0)) {
+                       if (!pbuf || ie_len == 0) {
                                break;
                        }
                }
@@ -2880,7 +2880,7 @@ void issue_assocreq(struct adapter *padapter)
        u8 vs_ie_length = 0;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL)
+       if (!pmgntframe)
                goto exit;
 
        /* update attribute */
@@ -3057,7 +3057,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da,
        pmlmeinfo = &(pmlmeext->mlmext_info);
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL)
+       if (!pmgntframe)
                goto exit;
 
        /* update attribute */
@@ -3196,7 +3196,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL)
+       if (!pmgntframe)
                goto exit;
 
        /* update attribute */
@@ -3309,7 +3309,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da,
        __le16 le_tmp;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL) {
+       if (!pmgntframe) {
                goto exit;
        }
 
@@ -3635,7 +3635,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
        action = ACT_PUBLIC_BSSCOEXIST;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
-       if (pmgntframe == NULL) {
+       if (!pmgntframe) {
                return;
        }
 
@@ -3702,7 +3702,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)
                        pbss_network = (struct wlan_bssid_ex *)&pnetwork->network;
 
                        p = rtw_get_ie(pbss_network->ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pbss_network->ie_length - _FIXED_IE_LENGTH_);
-                       if ((p == NULL) || (len == 0)) {/* non-HT */
+                       if (!p || len == 0) {/* non-HT */
 
                                if (pbss_network->configuration.ds_config <= 0)
                                        continue;
@@ -3765,7 +3765,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)
                        return _SUCCESS;
 
        psta = rtw_get_stainfo(pstapriv, addr);
-       if (psta == NULL)
+       if (!psta)
                return _SUCCESS;
 
        if (initiator == 0) {/*  recipient */
@@ -4637,13 +4637,13 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd_obj == NULL) {
+       if (!pcmd_obj) {
                return;
        }
 
        cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));
        pevtcmd = rtw_zmalloc(cmdsz);
-       if (pevtcmd == NULL) {
+       if (!pevtcmd) {
                kfree(pcmd_obj);
                return;
        }
@@ -4689,12 +4689,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
        pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (pcmd_obj == NULL)
+       if (!pcmd_obj)
                return;
 
        cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));
        pevtcmd = rtw_zmalloc(cmdsz);
-       if (pevtcmd == NULL) {
+       if (!pevtcmd) {
                kfree(pcmd_obj);
                return;
        }
@@ -5143,12 +5143,12 @@ void survey_timer_hdl(struct timer_list *t)
                }
 
                ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-               if (ph2c == NULL) {
+               if (!ph2c) {
                        goto exit_survey_timer_hdl;
                }
 
                psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
-               if (psurveyPara == NULL) {
+               if (!psurveyPara) {
                        kfree(ph2c);
                        goto exit_survey_timer_hdl;
                }
@@ -5777,7 +5777,7 @@ u8 chk_bmc_sleepq_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
@@ -5801,13 +5801,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
        int len_diff = 0;
 
        ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
-       if (ph2c == NULL) {
+       if (!ph2c) {
                res = _FAIL;
                goto exit;
        }
 
        ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));
-       if (ptxBeacon_parm == NULL) {
+       if (!ptxBeacon_parm) {
                kfree(ph2c);
                res = _FAIL;
                goto exit;
@@ -5867,7 +5867,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
        void (*event_callback)(struct adapter *dev, u8 *pbuf);
        struct evt_priv *pevt_priv = &(padapter->evtpriv);
 
-       if (pbuf == NULL)
+       if (!pbuf)
                goto _abort_event_;
 
        peventbuf = (uint *)pbuf;

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index b050bf62e3b9478f861d0140112e4e5ab3ea14ad..ac731415f73327af51fac472f99d26fc13d70bb1 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -51,7 +51,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
        struct arc4_ctx *ctx = &psecuritypriv->xmit_arc4_ctx;
 
-       if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
+       if (!((struct xmit_frame *)pxmitframe)->buf_addr)
                return;
 
        hw_hdr_offset = TXDESC_OFFSET;
@@ -476,7 +476,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
        struct arc4_ctx *ctx = &psecuritypriv->xmit_arc4_ctx;
        u32 res = _SUCCESS;
 
-       if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
+       if (!((struct xmit_frame *)pxmitframe)->buf_addr)
                return _FAIL;
 
        hw_hdr_offset = TXDESC_OFFSET;
@@ -1043,7 +1043,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
 
        u32 res = _SUCCESS;
 
-       if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
+       if (!((struct xmit_frame *)pxmitframe)->buf_addr)
                return _FAIL;
 
        hw_hdr_offset = TXDESC_OFFSET;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 448c4248ca4cfe148eca14a90bc7e728ac6ac157..20d05b4ee63e22d3cec4e65876874b7f53eb1d2d 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -391,7 +391,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
                }
                else
                {
-                       if (scanned == NULL) {
+                       if (!scanned) {
                                rtw_warn_on(1);
                                return;
                        }
@@ -432,7 +432,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
                struct wlan_bssid_ex  *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
                struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
 
-               if (scanned == NULL) {
+               if (!scanned) {
                        rtw_warn_on(1);
                        goto check_bss;
                }
@@ -551,10 +551,10 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
                        goto exit;
        }
 
-       if (strcmp(param->u.crypt.alg, "none") == 0 && (psta == NULL))
+       if (strcmp(param->u.crypt.alg, "none") == 0 && !psta)
                goto exit;
 
-       if (strcmp(param->u.crypt.alg, "WEP") == 0 && (psta == NULL))
+       if (strcmp(param->u.crypt.alg, "WEP") == 0 && !psta)
        {
                wep_key_idx = param->u.crypt.idx;
                wep_key_len = param->u.crypt.key_len;
@@ -907,7 +907,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
                        }
 
                        pbcmc_sta = rtw_get_bcmc_stainfo(padapter);
-                       if (pbcmc_sta == NULL)
+                       if (!pbcmc_sta)
                        {
                                /* DEBUG_ERR(("Set OID_802_11_ADD_KEY: bcmc stainfo is null\n")); */
                        }
@@ -947,7 +947,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
 
        param_len = sizeof(struct ieee_param) + params->key_len;
        param = rtw_malloc(param_len);
-       if (param == NULL)
+       if (!param)
                return -1;
 
        memset(param, 0, param_len);
@@ -1098,7 +1098,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
        }
 
        psta = rtw_get_stainfo(pstapriv, (u8 *)mac);
-       if (psta == NULL) {
+       if (!psta) {
                ret = -ENOENT;
                goto exit;
        }
@@ -1327,7 +1327,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
        struct rtw_wdev_priv *pwdev_priv;
        struct mlme_priv *pmlmepriv;
 
-       if (ndev == NULL) {
+       if (!ndev) {
                ret = -EINVAL;
                goto exit;
        }
@@ -1571,7 +1571,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
        u8 *pwpa, *pwpa2;
        u8 null_addr[] = {0, 0, 0, 0, 0, 0};
 
-       if (pie == NULL || !ielen) {
+       if (!pie || !ielen) {
                /* Treat this as normal case, but need to clear WIFI_UNDER_WPS */
                _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS);
                goto exit;
@@ -1583,7 +1583,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
        }
 
        buf = rtw_zmalloc(ielen);
-       if (buf == NULL) {
+       if (!buf) {
                ret =  -ENOMEM;
                goto exit;
        }
@@ -1873,7 +1873,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
                        wep_key_len = wep_key_len <= 5 ? 5 : 13;
                        wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, key_material);
                        pwep = rtw_malloc(wep_total_len);
-                       if (pwep == NULL) {
+                       if (!pwep) {
                                ret = -ENOMEM;
                                goto exit;
                        }
@@ -2708,7 +2708,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
        struct adapter *padapter;
        struct rtw_wdev_priv *pwdev_priv;
 
-       if (ndev == NULL) {
+       if (!ndev) {
                ret = -EINVAL;
                goto exit;
        }

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 295121c268bd4e0ac535af0441caec625653f2d7..f23ab3e103455c5132bd84208cd53ad9de71e5ae 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -153,7 +153,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 
                if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == true) { /* sta mode */
                        psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
-                       if (psta == NULL) {
+                       if (!psta) {
                                /* DEBUG_ERR(("Set wpa_set_encryption: Obtain Sta_info fail\n")); */
                        } else {
                                /* Jeff: don't disable ieee8021x_blocked while clearing key */
@@ -206,7 +206,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                        }
 
                        pbcmc_sta = rtw_get_bcmc_stainfo(padapter);
-                       if (pbcmc_sta == NULL) {
+                       if (!pbcmc_sta) {
                                /* DEBUG_ERR(("Set OID_802_11_ADD_KEY: bcmc stainfo is null\n")); */
                        } else {
                                /* Jeff: don't disable ieee8021x_blocked while clearing key */
@@ -236,9 +236,9 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
        int ret = 0;
        u8 null_addr[] = {0, 0, 0, 0, 0, 0};
 
-       if ((ielen > MAX_WPA_IE_LEN) || (pie == NULL)) {
+       if (ielen > MAX_WPA_IE_LEN || !pie) {
                _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS);
-               if (pie == NULL)
+               if (!pie)
                        return ret;
                else
                        return -EINVAL;
@@ -246,7 +246,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
 
        if (ielen) {
                buf = rtw_zmalloc(ielen);
-               if (buf == NULL) {
+               if (!buf) {
                        ret =  -ENOMEM;
                        goto exit;
                }
@@ -491,7 +491,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)
                return -EINVAL;
 
        param = rtw_malloc(p->length);
-       if (param == NULL)
+       if (!param)
                return -ENOMEM;
 
        if (copy_from_user(param, p->pointer, p->length)) {
@@ -571,7 +571,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                        goto exit;
        }
 
-       if (strcmp(param->u.crypt.alg, "none") == 0 && (psta == NULL)) {
+       if (strcmp(param->u.crypt.alg, "none") == 0 && !psta) {
                /* todo:clear default encryption keys */
 
                psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
@@ -583,7 +583,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
        }
 
 
-       if (strcmp(param->u.crypt.alg, "WEP") == 0 && (psta == NULL)) {
+       if (strcmp(param->u.crypt.alg, "WEP") == 0 && !psta) {
                wep_key_idx = param->u.crypt.idx;
                wep_key_len = param->u.crypt.key_len;
 
@@ -1227,7 +1227,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
                return -EINVAL;
 
        param = rtw_malloc(p->length);
-       if (param == NULL)
+       if (!param)
                return -ENOMEM;
 
        if (copy_from_user(param, p->pointer, p->length)) {

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 23f4f706f935c7018c783af330acf74a70af973b..279347be77c404798e4d585838d409a58f5f0ea6 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -488,7 +488,7 @@ void rtw_unregister_netdevs(struct dvobj_priv *dvobj)
 
        padapter = dvobj->padapters;
 
-       if (padapter == NULL)
+       if (!padapter)
                return;
 
        pnetdev = padapter->pnetdev;
@@ -594,7 +594,7 @@ struct dvobj_priv *devobj_init(void)
        struct dvobj_priv *pdvobj = NULL;
 
        pdvobj = rtw_zmalloc(sizeof(*pdvobj));
-       if (pdvobj == NULL)
+       if (!pdvobj)
                return NULL;
 
        mutex_init(&pdvobj->hw_init_mutex);