staging: rtl8188eu:Remove rtw_zmalloc(), wrapper for kzalloc() (fadbe0cd) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/staging/rtl8188eu/core/rtw_cmd.c

+62 −62

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

	pcmdpriv->cmd_seq = 1;		pcmdpriv->cmd_seq = 1;

	pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ);		pcmdpriv->cmd_allocated_buf = kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ, GFP_KERNEL);

	if (pcmdpriv->cmd_allocated_buf == NULL) {		if (pcmdpriv->cmd_allocated_buf == NULL) {
	res = _FAIL;		res = _FAIL;
	@@ -56,7 +56,7 @@ int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

	pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1));		pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1));

	pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4);		pcmdpriv->rsp_allocated_buf = kzalloc(MAX_RSPSZ + 4, GFP_KERNEL);

	if (pcmdpriv->rsp_allocated_buf == NULL) {		if (pcmdpriv->rsp_allocated_buf == NULL) {
	res = _FAIL;		res = _FAIL;
	@@ -437,11 +437,11 @@ u8 rtw_sitesurvey_cmd(struct adapter padapter, struct ndis_802_11_ssid ssid,
	if (check_fwstate(pmlmepriv, _FW_LINKED) == true)		if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
	p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);		p2p_ps_wk_cmd(padapter, P2P_PS_SCAN, 1);

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL)		if (ph2c == NULL)
	return _FAIL;		return _FAIL;

	psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));		psurveyPara = kzalloc(sizeof(struct sitesurvey_parm), GFP_KERNEL);
	if (psurveyPara == NULL) {		if (psurveyPara == NULL) {
	kfree(ph2c);		kfree(ph2c);
	return _FAIL;		return _FAIL;
	@@ -506,13 +506,13 @@ u8 rtw_setdatarate_cmd(struct adapter padapter, u8 rateset)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pbsetdataratepara = (struct setdatarate_parm *)rtw_zmalloc(sizeof(struct setdatarate_parm));		pbsetdataratepara = kzalloc(sizeof(struct setdatarate_parm), GFP_KERNEL);
	if (pbsetdataratepara == NULL) {		if (pbsetdataratepara == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -537,12 +537,12 @@ u8 rtw_setbasicrate_cmd(struct adapter padapter, u8 rateset)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	pssetbasicratepara = (struct setbasicrate_parm *)rtw_zmalloc(sizeof(struct setbasicrate_parm));		pssetbasicratepara = kzalloc(sizeof(struct setbasicrate_parm), GFP_KERNEL);

	if (pssetbasicratepara == NULL) {		if (pssetbasicratepara == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -577,12 +577,12 @@ u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	psetphypara = (struct setphy_parm *)rtw_zmalloc(sizeof(struct setphy_parm));		psetphypara = kzalloc(sizeof(struct setphy_parm), GFP_KERNEL);

	if (psetphypara == NULL) {		if (psetphypara == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -609,12 +609,12 @@ u8 rtw_setbbreg_cmd(struct adapter *padapter, u8 offset, u8 val)
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	pwritebbparm = (struct writeBB_parm *)rtw_zmalloc(sizeof(struct writeBB_parm));		pwritebbparm = kzalloc(sizeof(struct writeBB_parm), GFP_KERNEL);

	if (pwritebbparm == NULL) {		if (pwritebbparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -639,12 +639,12 @@ u8 rtw_getbbreg_cmd(struct adapter padapter, u8 offset, u8 pval)
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	prdbbparm = (struct readBB_parm *)rtw_zmalloc(sizeof(struct readBB_parm));		prdbbparm = kzalloc(sizeof(struct readBB_parm), GFP_KERNEL);

	if (prdbbparm == NULL) {		if (prdbbparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -671,12 +671,12 @@ u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val)
	struct writeRF_parm *pwriterfparm;		struct writeRF_parm *pwriterfparm;
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;
	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	pwriterfparm = (struct writeRF_parm *)rtw_zmalloc(sizeof(struct writeRF_parm));		pwriterfparm = kzalloc(sizeof(struct writeRF_parm), GFP_KERNEL);

	if (pwriterfparm == NULL) {		if (pwriterfparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -702,13 +702,13 @@ u8 rtw_getrfreg_cmd(struct adapter padapter, u8 offset, u8 pval)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	prdrfparm = (struct readRF_parm *)rtw_zmalloc(sizeof(struct readRF_parm));		prdrfparm = kzalloc(sizeof(struct readRF_parm), GFP_KERNEL);
	if (prdrfparm == NULL) {		if (prdrfparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -768,7 +768,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
	else		else
	RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));		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 = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd == NULL) {		if (pcmd == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	@@ -795,7 +795,7 @@ u8 rtw_createbss_cmd_ex(struct adapter padapter, unsigned char pbss, unsigned
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd == NULL) {		if (pcmd == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	@@ -840,7 +840,7 @@ u8 rtw_joinbss_cmd(struct adapter padapter, struct wlan_network pnetwork)
	else		else
	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));		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 = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd == NULL) {		if (pcmd == NULL) {
	res = _FAIL;		res = _FAIL;
	RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
	@@ -969,7 +969,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"));		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_disassoc_cmd\n"));

	/* prepare cmd parameter */		/* prepare cmd parameter */
	param = (struct disconnect_parm )rtw_zmalloc(sizeof(param));		param = kzalloc(sizeof(*param), GFP_KERNEL);
	if (param == NULL) {		if (param == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	@@ -978,7 +978,7 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueu

	if (enqueue) {		if (enqueue) {
	/* need enqueue, prepare cmd_obj and enqueue */		/* need enqueue, prepare cmd_obj and enqueue */
	cmdobj = (struct cmd_obj )rtw_zmalloc(sizeof(cmdobj));		cmdobj = kzalloc(sizeof(*cmdobj), GFP_KERNEL);
	if (cmdobj == NULL) {		if (cmdobj == NULL) {
	res = _FAIL;		res = _FAIL;
	kfree(param);		kfree(param);
	@@ -1008,12 +1008,12 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = false;		res = false;
	goto exit;		goto exit;
	}		}
	psetop = (struct setopmode_parm *)rtw_zmalloc(sizeof(struct setopmode_parm));		psetop = kzalloc(sizeof(struct setopmode_parm), GFP_KERNEL);

	if (psetop == NULL) {		if (psetop == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -1045,20 +1045,20 @@ u8 rtw_setstakey_cmd(struct adapter padapter, u8 psta, u8 unicast_key)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));		psetstakey_para = kzalloc(sizeof(struct set_stakey_parm), GFP_KERNEL);
	if (psetstakey_para == NULL) {		if (psetstakey_para == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));		psetstakey_rsp = kzalloc(sizeof(struct set_stakey_rsp), GFP_KERNEL);
	if (psetstakey_rsp == NULL) {		if (psetstakey_rsp == NULL) {
	kfree(ph2c);		kfree(ph2c);
	kfree(psetstakey_para);		kfree(psetstakey_para);
	@@ -1106,20 +1106,20 @@ u8 rtw_clearstakey_cmd(struct adapter padapter, u8 psta, u8 entry, u8 enqueue)
	if (!enqueue) {		if (!enqueue) {
	clear_cam_entry(padapter, entry);		clear_cam_entry(padapter, entry);
	} else {		} else {
	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetstakey_para = (struct set_stakey_parm *)rtw_zmalloc(sizeof(struct set_stakey_parm));		psetstakey_para = kzalloc(sizeof(struct set_stakey_parm), GFP_KERNEL);
	if (psetstakey_para == NULL) {		if (psetstakey_para == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetstakey_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_stakey_rsp));		psetstakey_rsp = kzalloc(sizeof(struct set_stakey_rsp), GFP_KERNEL);
	if (psetstakey_rsp == NULL) {		if (psetstakey_rsp == NULL) {
	kfree(ph2c);		kfree(ph2c);
	kfree(psetstakey_para);		kfree(psetstakey_para);
	@@ -1152,12 +1152,12 @@ u8 rtw_setrttbl_cmd(struct adapter padapter, struct setratable_parm prate_tab
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	psetrttblparm = (struct setratable_parm *)rtw_zmalloc(sizeof(struct setratable_parm));		psetrttblparm = kzalloc(sizeof(struct setratable_parm), GFP_KERNEL);

	if (psetrttblparm == NULL) {		if (psetrttblparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -1181,12 +1181,12 @@ u8 rtw_getrttbl_cmd(struct adapter padapter, struct getratable_rsp pval)
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}
	pgetrttblparm = (struct getratable_parm *)rtw_zmalloc(sizeof(struct getratable_parm));		pgetrttblparm = kzalloc(sizeof(struct getratable_parm), GFP_KERNEL);

	if (pgetrttblparm == NULL) {		if (pgetrttblparm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	@@ -1218,20 +1218,20 @@ u8 rtw_setassocsta_cmd(struct adapter padapter, u8 mac_addr)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetassocsta_para = (struct set_assocsta_parm *)rtw_zmalloc(sizeof(struct set_assocsta_parm));		psetassocsta_para = kzalloc(sizeof(struct set_assocsta_parm), GFP_KERNEL);
	if (psetassocsta_para == NULL) {		if (psetassocsta_para == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	psetassocsta_rsp = (struct set_stakey_rsp *)rtw_zmalloc(sizeof(struct set_assocsta_rsp));		psetassocsta_rsp = kzalloc(sizeof(struct set_assocsta_rsp), GFP_KERNEL);
	if (psetassocsta_rsp == NULL) {		if (psetassocsta_rsp == NULL) {
	kfree(ph2c);		kfree(ph2c);
	kfree(psetassocsta_para);		kfree(psetassocsta_para);
	@@ -1260,13 +1260,13 @@ u8 rtw_addbareq_cmd(struct adapter padapter, u8 tid, u8 addr)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	paddbareq_parm = (struct addBaReq_parm *)rtw_zmalloc(sizeof(struct addBaReq_parm));		paddbareq_parm = kzalloc(sizeof(struct addBaReq_parm), GFP_KERNEL);
	if (paddbareq_parm == NULL) {		if (paddbareq_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1297,13 +1297,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1338,7 +1338,7 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enque
	/* check input parameter */		/* check input parameter */

	/* prepare cmd parameter */		/* prepare cmd parameter */
	set_ch_parm = (struct set_ch_parm )rtw_zmalloc(sizeof(set_ch_parm));		set_ch_parm = kzalloc(sizeof(*set_ch_parm), GFP_KERNEL);
	if (set_ch_parm == NULL) {		if (set_ch_parm == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	@@ -1349,7 +1349,7 @@ u8 rtw_set_ch_cmd(struct adapter *padapter, u8 ch, u8 bw, u8 ch_offset, u8 enque

	if (enqueue) {		if (enqueue) {
	/* need enqueue, prepare cmd_obj and enqueue */		/* need enqueue, prepare cmd_obj and enqueue */
	pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmdobj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmdobj == NULL) {		if (pcmdobj == NULL) {
	kfree(set_ch_parm);		kfree(set_ch_parm);
	res = _FAIL;		res = _FAIL;
	@@ -1394,7 +1394,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)
	}		}

	/* prepare cmd parameter */		/* prepare cmd parameter */
	setChannelPlan_param = (struct SetChannelPlan_param *)rtw_zmalloc(sizeof(struct SetChannelPlan_param));		setChannelPlan_param = kzalloc(sizeof(struct SetChannelPlan_param), GFP_KERNEL);
	if (setChannelPlan_param == NULL) {		if (setChannelPlan_param == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	@@ -1403,7 +1403,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue)

	if (enqueue) {		if (enqueue) {
	/* need enqueue, prepare cmd_obj and enqueue */		/* need enqueue, prepare cmd_obj and enqueue */
	pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmdobj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmdobj == NULL) {		if (pcmdobj == NULL) {
	kfree(setChannelPlan_param);		kfree(setChannelPlan_param);
	res = _FAIL;		res = _FAIL;
	@@ -1441,13 +1441,13 @@ u8 rtw_set_csa_cmd(struct adapter *padapter, u8 new_ch_no)

	RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+rtw_set_csa_cmd\n"));

	pcmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmdobj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmdobj == NULL) {		if (pcmdobj == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	setChannelSwitch_param = (struct SetChannelSwitch_param *)rtw_zmalloc(sizeof(struct SetChannelSwitch_param));		setChannelSwitch_param = kzalloc(sizeof(struct SetChannelSwitch_param), GFP_KERNEL);
	if (setChannelSwitch_param == NULL) {		if (setChannelSwitch_param == NULL) {
	kfree(pcmdobj);		kfree(pcmdobj);
	res = _FAIL;		res = _FAIL;
	@@ -1602,13 +1602,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue)
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	if (enqueue) {		if (enqueue) {
	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1645,13 +1645,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time)

	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1687,13 +1687,13 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue)
	return res;		return res;

	if (enqueue) {		if (enqueue) {
	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1733,13 +1733,13 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType)
	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
	return res;		return res;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1769,13 +1769,13 @@ u8 rtw_ps_cmd(struct adapter *padapter)

	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ppscmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ppscmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ppscmd == NULL) {		if (ppscmd == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ppscmd);		kfree(ppscmd);
	res = _FAIL;		res = _FAIL;
	@@ -1843,13 +1843,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter)
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;
	@@ -1875,13 +1875,13 @@ u8 rtw_c2h_wk_cmd(struct adapter padapter, u8 c2h_evt)
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
	u8 res = _SUCCESS;		u8 res = _SUCCESS;

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)rtw_zmalloc(sizeof(struct drvextra_cmd_parm));		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);
	if (pdrvextra_cmd_parm == NULL) {		if (pdrvextra_cmd_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;

drivers/staging/rtl8188eu/core/rtw_efuse.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@ efuse_phymap_to_logical(u8 phymap, u16 _offset, u16 _size_byte, u8 pbuf)
	u16 efuse_utilized = 0;		u16 efuse_utilized = 0;
	u8 u1temp = 0;		u8 u1temp = 0;

	efuseTbl = (u8 *)rtw_zmalloc(EFUSE_MAP_LEN_88E);		efuseTbl = kzalloc(EFUSE_MAP_LEN_88E, GFP_KERNEL);
	if (efuseTbl == NULL) {		if (efuseTbl == NULL) {
	DBG_88E("%s: alloc efuseTbl fail!\n", __func__);		DBG_88E("%s: alloc efuseTbl fail!\n", __func__);
	goto exit;		goto exit;
	@@ -1083,7 +1083,7 @@ u8 rtw_efuse_map_write(struct adapter padapter, u16 addr, u16 cnts, u8 data)
	if ((addr + cnts) > mapLen)		if ((addr + cnts) > mapLen)
	return _FAIL;		return _FAIL;

	map = rtw_zmalloc(mapLen);		map = kzalloc(mapLen, GFP_KERNEL);
	if (map == NULL)		if (map == NULL)
	return _FAIL;		return _FAIL;

drivers/staging/rtl8188eu/core/rtw_mlme.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1666,13 +1666,13 @@ int rtw_set_auth(struct adapter adapter, struct security_priv psecuritypriv)
	struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);		struct cmd_priv *pcmdpriv = &(adapter->cmdpriv);
	int res = _SUCCESS;		int res = _SUCCESS;

	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd == NULL) {		if (pcmd == NULL) {
	res = _FAIL; /* try again */		res = _FAIL; /* try again */
	goto exit;		goto exit;
	}		}

	psetauthparm = (struct setauth_parm *)rtw_zmalloc(sizeof(struct setauth_parm));		psetauthparm = kzalloc(sizeof(struct setauth_parm), GFP_KERNEL);
	if (psetauthparm == NULL) {		if (psetauthparm == NULL) {
	kfree(pcmd);		kfree(pcmd);
	res = _FAIL;		res = _FAIL;
	@@ -1703,11 +1703,11 @@ int rtw_set_key(struct adapter adapter, struct security_priv psecuritypriv, in
	struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);		struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
	int res = _SUCCESS;		int res = _SUCCESS;

	pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd == NULL)		if (pcmd == NULL)
	return _FAIL; /* try again */		return _FAIL; /* try again */

	psetkeyparm = (struct setkey_parm *)rtw_zmalloc(sizeof(struct setkey_parm));		psetkeyparm = kzalloc(sizeof(struct setkey_parm), GFP_KERNEL);
	if (psetkeyparm == NULL) {		if (psetkeyparm == NULL) {
	res = _FAIL;		res = _FAIL;
	goto err_free_cmd;		goto err_free_cmd;

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -7055,12 +7055,12 @@ void report_survey_event(struct adapter *padapter,
	pcmdpriv = &padapter->cmdpriv;		pcmdpriv = &padapter->cmdpriv;


	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd_obj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd_obj == NULL)		if (pcmd_obj == NULL)
	return;		return;

	cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));		cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header));
	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);		pevtcmd = kzalloc(cmdsz, GFP_KERNEL);
	if (pevtcmd == NULL) {		if (pevtcmd == NULL) {
	kfree(pcmd_obj);		kfree(pcmd_obj);
	return;		return;
	@@ -7107,12 +7107,12 @@ void report_surveydone_event(struct adapter *padapter)
	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd_obj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd_obj == NULL)		if (pcmd_obj == NULL)
	return;		return;

	cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));		cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));
	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);		pevtcmd = kzalloc(cmdsz, GFP_KERNEL);
	if (pevtcmd == NULL) {		if (pevtcmd == NULL) {
	kfree(pcmd_obj);		kfree(pcmd_obj);
	return;		return;
	@@ -7153,12 +7153,12 @@ void report_join_res(struct adapter *padapter, int res)
	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);		struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd_obj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd_obj == NULL)		if (pcmd_obj == NULL)
	return;		return;

	cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));		cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header));
	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);		pevtcmd = kzalloc(cmdsz, GFP_KERNEL);
	if (pevtcmd == NULL) {		if (pevtcmd == NULL) {
	kfree(pcmd_obj);		kfree(pcmd_obj);
	return;		return;
	@@ -7206,12 +7206,12 @@ void report_del_sta_event(struct adapter padapter, unsigned char MacAddr, unsi
	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd_obj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd_obj == NULL)		if (pcmd_obj == NULL)
	return;		return;

	cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));		cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header));
	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);		pevtcmd = kzalloc(cmdsz, GFP_KERNEL);
	if (pevtcmd == NULL) {		if (pevtcmd == NULL) {
	kfree(pcmd_obj);		kfree(pcmd_obj);
	return;		return;
	@@ -7261,12 +7261,12 @@ void report_add_sta_event(struct adapter padapter, unsigned char MacAddr, int
	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;		struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
	struct cmd_priv *pcmdpriv = &padapter->cmdpriv;		struct cmd_priv *pcmdpriv = &padapter->cmdpriv;

	pcmd_obj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		pcmd_obj = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (pcmd_obj == NULL)		if (pcmd_obj == NULL)
	return;		return;

	cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));		cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header));
	pevtcmd = (u8 *)rtw_zmalloc(cmdsz);		pevtcmd = kzalloc(cmdsz, GFP_KERNEL);
	if (pevtcmd == NULL) {		if (pevtcmd == NULL) {
	kfree(pcmd_obj);		kfree(pcmd_obj);
	return;		return;
	@@ -7686,11 +7686,11 @@ void survey_timer_hdl(struct adapter *padapter)
	pmlmeext->scan_abort = false;/* reset */		pmlmeext->scan_abort = false;/* reset */
	}		}

	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL)		if (ph2c == NULL)
	goto exit_survey_timer_hdl;		goto exit_survey_timer_hdl;

	psurveyPara = (struct sitesurvey_parm *)rtw_zmalloc(sizeof(struct sitesurvey_parm));		psurveyPara = kzalloc(sizeof(struct sitesurvey_parm), GFP_KERNEL);
	if (psurveyPara == NULL) {		if (psurveyPara == NULL) {
	kfree(ph2c);		kfree(ph2c);
	goto exit_survey_timer_hdl;		goto exit_survey_timer_hdl;
	@@ -8268,13 +8268,13 @@ u8 set_tx_beacon_cmd(struct adapter *padapter)
	int len_diff = 0;		int len_diff = 0;


	ph2c = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);
	if (ph2c == NULL) {		if (ph2c == NULL) {
	res = _FAIL;		res = _FAIL;
	goto exit;		goto exit;
	}		}

	ptxBeacon_parm = (struct Tx_Beacon_param *)rtw_zmalloc(sizeof(struct Tx_Beacon_param));		ptxBeacon_parm = kzalloc(sizeof(struct Tx_Beacon_param), GFP_KERNEL);
	if (ptxBeacon_parm == NULL) {		if (ptxBeacon_parm == NULL) {
	kfree(ph2c);		kfree(ph2c);
	res = _FAIL;		res = _FAIL;

drivers/staging/rtl8188eu/core/rtw_mp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -687,7 +687,7 @@ void SetPacketTx(struct adapter *padapter)
	kfree(pmp_priv->tx.pallocated_buf);		kfree(pmp_priv->tx.pallocated_buf);
	pmp_priv->tx.write_size = pkt_size;		pmp_priv->tx.write_size = pkt_size;
	pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ;		pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ;
	pmp_priv->tx.pallocated_buf = rtw_zmalloc(pmp_priv->tx.buf_size);		pmp_priv->tx.pallocated_buf = kzalloc(pmp_priv->tx.buf_size, GFP_KERNEL);
	if (pmp_priv->tx.pallocated_buf == NULL) {		if (pmp_priv->tx.pallocated_buf == NULL) {
	DBG_88E("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size);		DBG_88E("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size);
	return;		return;