staging: rtl8723bs: Remove unnecessary rtw_z?malloc casts

These functions now return void * and no longer need casts.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
index d3007c1c45e3723fe0678cdeb5c50857ee5c6bcd..0b530ea7fd81919f5591c4a1f8277da582b7038b 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c
@@ -1581,15 +1581,13 @@ u8 rtw_ap_set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(
-               sizeof(struct set_stakey_parm)
-       );
+       psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
        if (psetstakey_para == NULL) {
                kfree((u8 *) ph2c);
                res = _FAIL;
@@ -1630,12 +1628,12 @@ static int rtw_ap_set_key(
 
        /* DBG_871X("%s\n", __func__); */
 
-       pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
                res = _FAIL;
                goto exit;
        }
-       psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));
+       psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
        if (psetkeyparm == NULL) {
                kfree((unsigned char *)pcmd);
                res = _FAIL;

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index d381827dba3bf7223c1212c8ad0178a831f05575..1843c44bc7a4ae8a8034461fb331e4dd37057ce8 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -613,11 +613,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 = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL)
                return _FAIL;
 
-       psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));
+       psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
        if (psurveyPara == NULL) {
                kfree((unsigned char *) ph2c);
                return _FAIL;
@@ -681,13 +681,13 @@ u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pbsetdataratepara = (struct setdatarate_parm *)rtw_zmalloc(sizeof(struct setdatarate_parm));
+       pbsetdataratepara = rtw_zmalloc(sizeof(struct setdatarate_parm));
        if (pbsetdataratepara == NULL) {
                kfree((u8 *) ph2c);
                res = _FAIL;
@@ -724,7 +724,7 @@ u8 rtw_createbss_cmd(struct adapter  *padapter)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
        }
 
-       pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
                res = _FAIL;
                goto exit;
@@ -757,7 +757,7 @@ u8 rtw_startbss_cmd(struct adapter  *padapter, int flags)
                start_bss_network(padapter, (u8 *)&(padapter->mlmepriv.cur_network.network));
        } else {
                /* need enqueue, prepare cmd_obj and enqueue */
-               pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
                if (pcmd == NULL) {
                        res = _FAIL;
                        goto exit;
@@ -815,7 +815,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));
        }
 
-       pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
                res = _FAIL;
                RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
@@ -943,7 +943,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
        RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));
 
        /* prepare cmd parameter */
-       param = (struct disconnect_parm *)rtw_zmalloc(sizeof(*param));
+       param = rtw_zmalloc(sizeof(*param));
        if (param == NULL) {
                res = _FAIL;
                goto exit;
@@ -952,7 +952,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu
 
        if (enqueue) {
                /* need enqueue, prepare cmd_obj and enqueue */
-               cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(*cmdobj));
+               cmdobj = rtw_zmalloc(sizeof(*cmdobj));
                if (cmdobj == NULL) {
                        res = _FAIL;
                        kfree((u8 *)param);
@@ -979,7 +979,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
        struct  cmd_priv   *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       psetop = (struct setopmode_parm *)rtw_zmalloc(sizeof(struct setopmode_parm));
+       psetop = rtw_zmalloc(sizeof(struct setopmode_parm));
 
        if (psetop == NULL) {
                res = _FAIL;
@@ -988,7 +988,7 @@ u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRAST
        psetop->mode = (u8)networktype;
 
        if (enqueue) {
-               ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                if (ph2c == NULL) {
                        kfree((u8 *)psetop);
                        res = _FAIL;
@@ -1016,7 +1016,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
        struct security_priv    *psecuritypriv = &padapter->securitypriv;
        u8 res = _SUCCESS;
 
-       psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));
+       psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
        if (psetstakey_para == NULL) {
                res = _FAIL;
                goto exit;
@@ -1040,14 +1040,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 unicast_
        padapter->securitypriv.busetkipkey = true;
 
        if (enqueue) {
-               ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                if (ph2c == NULL) {
                        kfree((u8 *) psetstakey_para);
                        res = _FAIL;
                        goto exit;
                }
 
-               psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+               psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
                if (psetstakey_rsp == NULL) {
                        kfree((u8 *) ph2c);
                        kfree((u8 *) psetstakey_para);
@@ -1083,20 +1083,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueu
                        rtw_camid_free(padapter, cam_id);
                }
        } else{
-               ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                if (ph2c == NULL) {
                        res = _FAIL;
                        goto exit;
                }
 
-               psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));
+               psetstakey_para = rtw_zmalloc(sizeof(struct set_stakey_parm));
                if (psetstakey_para == NULL) {
                        kfree((u8 *) ph2c);
                        res = _FAIL;
                        goto exit;
                }
 
-               psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));
+               psetstakey_rsp = rtw_zmalloc(sizeof(struct set_stakey_rsp));
                if (psetstakey_rsp == NULL) {
                        kfree((u8 *) ph2c);
                        kfree((u8 *) psetstakey_para);
@@ -1128,13 +1128,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr)
 
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       paddbareq_parm = (struct addBaReq_parm *)rtw_zmalloc(sizeof(struct addBaReq_parm));
+       paddbareq_parm = rtw_zmalloc(sizeof(struct addBaReq_parm));
        if (paddbareq_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1162,13 +1162,13 @@ u8 rtw_reset_securitypriv_cmd(struct adapter *padapter)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1197,13 +1197,13 @@ u8 rtw_free_assoc_resources_cmd(struct adapter *padapter)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1233,13 +1233,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
        /* only  primary padapter does this cmd */
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1283,7 +1283,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue, u8 swconf
        }
 
        /* prepare cmd parameter */
-       setChannelPlan_param = (struct  SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param));
+       setChannelPlan_param = rtw_zmalloc(sizeof(struct SetChannelPlan_param));
        if (setChannelPlan_param == NULL) {
                res = _FAIL;
                goto exit;
@@ -1292,7 +1292,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 = (struct       cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+               pcmdobj = rtw_zmalloc(sizeof(struct cmd_obj));
                if (pcmdobj == NULL) {
                        kfree((u8 *)setChannelPlan_param);
                        res = _FAIL;
@@ -1553,13 +1553,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
        /*      return res; */
 
        if (enqueue) {
-               ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                if (ph2c == NULL) {
                        res = _FAIL;
                        goto exit;
                }
 
-               pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+               pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
                if (pdrvextra_cmd_parm == NULL) {
                        kfree((unsigned char *)ph2c);
                        res = _FAIL;
@@ -1595,13 +1595,13 @@ u8 rtw_dm_in_lps_wk_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
 
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1668,13 +1668,13 @@ u8 rtw_dm_ra_mask_wk_cmd(struct adapter *padapter, u8 *psta)
        u8 res = _SUCCESS;
 
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1719,13 +1719,13 @@ u8 rtw_ps_cmd(struct adapter *padapter)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ppscmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ppscmd == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ppscmd);
                res = _FAIL;
@@ -1791,13 +1791,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;
@@ -1890,13 +1890,13 @@ u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((u8 *)ph2c);
                res = _FAIL;
@@ -1925,13 +1925,13 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
+       pdrvextra_cmd_parm = rtw_zmalloc(sizeof(struct drvextra_cmd_parm));
        if (pdrvextra_cmd_parm == NULL) {
                kfree((u8 *)ph2c);
                res = _FAIL;
@@ -1967,7 +1967,7 @@ static void c2h_wk_callback(_workitem *work)
                        /* This C2H event is read, clear it */
                        c2h_evt_clear(adapter);
                } else{
-                       c2h_evt = (u8 *)rtw_malloc(16);
+                       c2h_evt = rtw_malloc(16);
                        if (c2h_evt != NULL) {
                                /* This C2H event is not read, read & clear now */
                                if (rtw_hal_c2h_evt_read(adapter, c2h_evt) != _SUCCESS) {

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 6b778206a1a36ffc12e040a1922126007802052a..37b683d4d1fa97255e3256682685744fc467ac47 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2272,13 +2272,13 @@ sint rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)
        struct  cmd_priv *pcmdpriv = &(adapter->cmdpriv);
        sint            res = _SUCCESS;
 
-       pcmd = (struct  cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+       pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd == NULL) {
                res = _FAIL;  /* try again */
                goto exit;
        }
 
-       psetauthparm = (struct setauth_parm *)rtw_zmalloc(sizeof(struct setauth_parm));
+       psetauthparm = rtw_zmalloc(sizeof(struct setauth_parm));
        if (psetauthparm == NULL) {
                kfree((unsigned char *)pcmd);
                res = _FAIL;
@@ -2313,7 +2313,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s
        struct cmd_priv         *pcmdpriv = &(adapter->cmdpriv);
        sint    res = _SUCCESS;
 
-       psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));
+       psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm));
        if (psetkeyparm == NULL) {
                res = _FAIL;
                goto exit;
@@ -2365,7 +2365,7 @@ sint rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, s
 
 
        if (enqueue) {
-               pcmd = (struct  cmd_obj *)rtw_zmalloc(sizeof(struct     cmd_obj));
+               pcmd = rtw_zmalloc(sizeof(struct cmd_obj));
                if (pcmd == NULL) {
                        kfree((unsigned char *)psetkeyparm);
                        res = _FAIL;  /* try again */

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index b6d137f505e1e0faed2bbeb92b179ff88a975ec4..99ed52bd19100fe5919898e659caa71e0b1517ec 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -818,7 +818,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
        if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) {
                if (pmlmeinfo->state & WIFI_FW_AUTH_NULL) {
                        /* we should update current network before auth, or some IE is wrong */
-                       pbss = (struct wlan_bssid_ex *)rtw_malloc(sizeof(struct wlan_bssid_ex));
+                       pbss = rtw_malloc(sizeof(struct wlan_bssid_ex));
                        if (pbss) {
                                if (collect_bss_info(padapter, precv_frame, pbss) == _SUCCESS) {
                                        update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true);
@@ -5049,12 +5049,12 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame
        pmlmeext = &padapter->mlmeextpriv;
        pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL)
                return;
 
        cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5102,12 +5102,12 @@ void report_surveydone_event(struct adapter *padapter)
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL)
                return;
 
        cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5149,12 +5149,12 @@ void report_join_res(struct adapter *padapter, int res)
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL)
                return;
 
        cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5200,12 +5200,12 @@ void report_wmm_edca_update(struct adapter *padapter)
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL)
                return;
 
        cmdsz = (sizeof(struct wmm_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5246,13 +5246,13 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL) {
                return;
        }
 
        cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5302,12 +5302,12 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int
        struct mlme_ext_priv    *pmlmeext = &padapter->mlmeextpriv;
        struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
 
-       pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       pcmd_obj = rtw_zmalloc(sizeof(struct cmd_obj));
        if (pcmd_obj == NULL)
                return;
 
        cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));
-       pevtcmd = (u8 *)rtw_zmalloc(cmdsz);
+       pevtcmd = rtw_zmalloc(cmdsz);
        if (pevtcmd == NULL) {
                kfree((u8 *)pcmd_obj);
                return;
@@ -5853,12 +5853,12 @@ void survey_timer_hdl(struct adapter *padapter)
                        pmlmeext->scan_abort = false;/* reset */
                }
 
-               ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+               ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
                if (ph2c == NULL) {
                        goto exit_survey_timer_hdl;
                }
 
-               psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));
+               psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm));
                if (psurveyPara == NULL) {
                        kfree((unsigned char *)ph2c);
                        goto exit_survey_timer_hdl;
@@ -6602,7 +6602,7 @@ u8 chk_bmc_sleepq_cmd(struct adapter *padapter)
        struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
        u8 res = _SUCCESS;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
@@ -6626,13 +6626,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
        u8 res = _SUCCESS;
        int len_diff = 0;
 
-       ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
+       ph2c = rtw_zmalloc(sizeof(struct cmd_obj));
        if (ph2c == NULL) {
                res = _FAIL;
                goto exit;
        }
 
-       ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc(sizeof(struct Tx_Beacon_param));
+       ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param));
        if (ptxBeacon_parm == NULL) {
                kfree((unsigned char *)ph2c);
                res = _FAIL;

diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c
index 06a7e4059fbb3847edc0b987dce3d632d9697b5f..aadf67bd0559cfbc81e9432810882b232094bfb2 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_security.c
+++ b/drivers/staging/rtl8723bs/core/rtw_security.c
@@ -2272,7 +2272,7 @@ static void *aes_encrypt_init(u8 *key, size_t len)
        u32 *rk;
        if (len != 16)
                return NULL;
-       rk = (u32 *)rtw_malloc(AES_PRIV_SIZE);
+       rk = rtw_malloc(AES_PRIV_SIZE);
        if (rk == NULL)
                return NULL;
        rijndaelKeySetupEnc(rk, key);

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index f485f541e36d0ca4d6a364993ea69751733b76bc..a1695348d1d5931a8097f53aa60bc39cfc30ecce 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1359,7 +1359,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
                return true;
        }
 
-       bssid = (struct wlan_bssid_ex *)rtw_zmalloc(sizeof(struct wlan_bssid_ex));
+       bssid = rtw_zmalloc(sizeof(struct wlan_bssid_ex));
        if (bssid == NULL) {
                DBG_871X("%s rtw_zmalloc fail !!!\n", __func__);
                return true;

diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c
index 022f654419e4dcd0724f86444fb37de77ef40641..f560951bed65aba20e8bf8676a94ab334b8b2fe0 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_xmit.c
+++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c
@@ -2166,7 +2166,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter)
 
        pxmitpriv->hwxmits = NULL;
 
-       pxmitpriv->hwxmits = (struct hw_xmit *)rtw_zmalloc(sizeof(struct hw_xmit) * pxmitpriv->hwxmit_entry);
+       pxmitpriv->hwxmits = rtw_zmalloc(sizeof(struct hw_xmit) * pxmitpriv->hwxmit_entry);
 
        if (pxmitpriv->hwxmits == NULL) {
                DBG_871X("alloc hwxmits fail!...\n");

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 1565f2d67ea4ab224ee6c0c067f6ae740c5b042a..d6cef9e8378d36e4a013f1535bb0d694e828e4da 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -891,7 +891,7 @@ static void hal_ReadEFuse_WiFi(
                return;
        }
 
-       efuseTbl = (u8 *)rtw_malloc(EFUSE_MAX_MAP_LEN);
+       efuseTbl = rtw_malloc(EFUSE_MAX_MAP_LEN);
        if (efuseTbl == NULL) {
                DBG_8192C("%s: alloc efuseTbl fail!\n", __func__);
                return;

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index 1d1b14dedd35d8d1a540dbc524f4fb2e2cf510a8..9a4c24861947dbb8a333d2ecaf66c45040865acd 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -218,7 +218,7 @@ static u32 sdio_read32(struct intf_hdl *pintfhdl, u32 addr)
        } else {
                u8 *ptmpbuf;
 
-               ptmpbuf = (u8 *)rtw_malloc(8);
+               ptmpbuf = rtw_malloc(8);
                if (NULL == ptmpbuf) {
                        DBG_8192C(KERN_ERR "%s: Allocate memory FAIL!(size =8) addr = 0x%x\n", __func__, addr);
                        return SDIO_ERR_VAL32;
@@ -594,7 +594,7 @@ static s32 _sdio_local_read(
        }
 
        n = RND4(cnt);
-       ptmpbuf = (u8 *)rtw_malloc(n);
+       ptmpbuf = rtw_malloc(n);
        if (!ptmpbuf)
                return (-1);
 
@@ -637,7 +637,7 @@ s32 sdio_local_read(
        }
 
        n = RND4(cnt);
-       ptmpbuf = (u8 *)rtw_malloc(n);
+       ptmpbuf = rtw_malloc(n);
        if (!ptmpbuf)
                return (-1);
 
@@ -684,7 +684,7 @@ s32 sdio_local_write(
                return err;
        }
 
-       ptmpbuf = (u8 *)rtw_malloc(cnt);
+       ptmpbuf = rtw_malloc(cnt);
        if (!ptmpbuf)
                return (-1);
 
@@ -1108,7 +1108,7 @@ void sd_int_dpc(struct adapter *padapter)
                struct c2h_evt_hdr_88xx *c2h_evt;
 
                DBG_8192C("%s: C2H Command\n", __func__);
-               c2h_evt = (struct c2h_evt_hdr_88xx *)rtw_zmalloc(16);
+               c2h_evt = rtw_zmalloc(16);
                if (c2h_evt != NULL) {
                        if (rtw_hal_c2h_evt_read(padapter, (u8 *)c2h_evt) == _SUCCESS) {
                                if (c2h_id_filter_ccx_8723b((u8 *)c2h_evt)) {

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index bd4352fe2de315a8b1f636a73d09974f0bcd6628..51d48de24a24908129758de2eb95be5c2c046046 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -136,11 +136,9 @@ static struct ieee80211_supported_band *rtw_spt_band_alloc(
                goto exit;
        }
 
-       spt_band = (struct ieee80211_supported_band *)rtw_zmalloc(
-               sizeof(struct ieee80211_supported_band)
-               + sizeof(struct ieee80211_channel)*n_channels
-               + sizeof(struct ieee80211_rate)*n_bitrates
-       );
+       spt_band = rtw_zmalloc(sizeof(struct ieee80211_supported_band) +
+                              sizeof(struct ieee80211_channel) * n_channels +
+                              sizeof(struct ieee80211_rate) * n_bitrates);
        if (!spt_band)
                goto exit;
 
@@ -1094,7 +1092,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
        DBG_871X("pairwise =%d\n", pairwise);
 
        param_len = sizeof(struct ieee_param) + params->key_len;
-       param = (struct ieee_param *)rtw_malloc(param_len);
+       param = rtw_malloc(param_len);
        if (param == NULL)
                return -1;
 
@@ -2183,7 +2181,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, KeyMaterial);
-                       pwep =(struct ndis_802_11_wep    *) rtw_malloc(wep_total_len);
+                       pwep = rtw_malloc(wep_total_len);
                        if (pwep == NULL) {
                                DBG_871X(" wpa_set_encryption: pwep allocate fail !!!\n");
                                ret = -ENOMEM;
@@ -2677,7 +2675,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
        pnpi->sizeof_priv = sizeof(struct adapter);
 
        /*  wdev */
-       mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
+       mon_wdev = rtw_zmalloc(sizeof(struct wireless_dev));
        if (!mon_wdev) {
                DBG_871X(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter));
                ret = -ENOMEM;
@@ -3497,7 +3495,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
        }
 
        /*  wdev */
-       wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
+       wdev = rtw_zmalloc(sizeof(struct wireless_dev));
        if (!wdev) {
                DBG_8192C("Couldn't allocate wireless device\n");
                ret = -ENOMEM;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index d5e5f830f2a16388129fe25b01bf0b7eaa85ae69..ffbb35ad2ac0a92ef9422115d7fd2c5b35db43ed 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -557,7 +557,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                if (wep_key_len > 0) {
                        wep_key_len = wep_key_len <= 5 ? 5 : 13;
                        wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
-                       pwep =(struct ndis_802_11_wep    *) rtw_malloc(wep_total_len);
+                       pwep = rtw_malloc(wep_total_len);
                        if (pwep == NULL) {
                                RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n"));
                                goto exit;
@@ -2238,7 +2238,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
        int ret = 0;
 
        param_len = sizeof(struct ieee_param) + pext->key_len;
-       param = (struct ieee_param *)rtw_malloc(param_len);
+       param = rtw_malloc(param_len);
        if (param == NULL)
                return -1;
 
@@ -2347,7 +2347,7 @@ static int rtw_wx_read32(struct net_device *dev,
        if (0 == len)
                return -EINVAL;
 
-       ptmp = (u8 *)rtw_malloc(len);
+       ptmp = rtw_malloc(len);
        if (NULL == ptmp)
                return -ENOMEM;
 
@@ -3500,7 +3500,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)
                goto out;
        }
 
-       param = (struct ieee_param *)rtw_malloc(p->length);
+       param = rtw_malloc(p->length);
        if (param == NULL) {
                ret = -ENOMEM;
                goto out;
@@ -3621,7 +3621,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
                if (wep_key_len > 0) {
                        wep_key_len = wep_key_len <= 5 ? 5 : 13;
                        wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
-                       pwep =(struct ndis_802_11_wep *)rtw_malloc(wep_total_len);
+                       pwep = rtw_malloc(wep_total_len);
                        if (pwep == NULL) {
                                DBG_871X(" r871x_set_encryption: pwep allocate fail !!!\n");
                                goto exit;
@@ -4345,7 +4345,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
                goto out;
        }
 
-       param = (struct ieee_param *)rtw_malloc(p->length);
+       param = rtw_malloc(p->length);
        if (param == NULL) {
                ret = -ENOMEM;
                goto out;
@@ -4673,7 +4673,7 @@ static int rtw_test(
        DBG_871X("+%s\n", __func__);
        len = wrqu->data.length;
 
-       pbuf = (u8 *)rtw_zmalloc(len);
+       pbuf = rtw_zmalloc(len);
        if (pbuf == NULL) {
                DBG_871X("%s: no memory!\n", __func__);
                return -ENOMEM;

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 021589913681075bbcaeb50cf97add2bf4228629..3aeb2bb4807aa27fc9e40614390acd1662888098 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -691,7 +691,8 @@ struct dvobj_priv *devobj_init(void)
 {
        struct dvobj_priv *pdvobj = NULL;
 
-       if ((pdvobj = (struct dvobj_priv*)rtw_zmalloc(sizeof(*pdvobj))) == NULL)
+       pdvobj = rtw_zmalloc(sizeof(*pdvobj));
+       if (pdvobj == NULL)
                return NULL;
 
        mutex_init(&pdvobj->hw_init_mutex);

diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index 93747c2bce526cd9b3133ab62b3e4831c0b94a2c..9255cf73bdadf0b9089eb1083022f09d553fcaff 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -465,7 +465,7 @@ struct rtw_cbuf *rtw_cbuf_alloc(u32 size)
 {
        struct rtw_cbuf *cbuf;
 
-       cbuf = (struct rtw_cbuf *)rtw_malloc(sizeof(*cbuf) + sizeof(void*)*size);
+       cbuf = rtw_malloc(sizeof(*cbuf) + sizeof(void *) * size);
 
        if (cbuf) {
                cbuf->write = cbuf->read = 0;