Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f7ed6b authored by Mamta Shukla's avatar Mamta Shukla Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: core: Use sizeof(*p) instead of sizeof(struct P) for memory allocation 



Use sizeof(*ptr) instead of sizeof(ptr_type) makes memory
allocation easy in case the type of pointer changes.
Fix all checkpatch reported issues for "CHECK: Prefer
kzalloc(sizeof(*<p>)...) over kzalloc(sizeof(struct <P>)...)".

Signed-off-by: default avatarMamta Shukla <mamtashukla555@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b8429b0

drivers/staging/rtl8188eu/core/rtw_cmd.c

+28 −28
Original line number Diff line number Diff line
@@ -243,11 +243,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
	if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c)

		return _FAIL;



	psurveyPara = kzalloc(sizeof(struct sitesurvey_parm), GFP_ATOMIC);

	psurveyPara = kzalloc(sizeof(*psurveyPara), GFP_ATOMIC);

	if (!psurveyPara) {

		kfree(ph2c);

		return _FAIL;
@@ -325,7 +325,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter) 
	else

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	pcmd = kzalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (!pcmd) {

		res = _FAIL;

		goto exit;
@@ -367,7 +367,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	else

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	pcmd = kzalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (!pcmd) {

		res = _FAIL;

		goto exit;
@@ -527,8 +527,8 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n 


	struct	cmd_priv   *pcmdpriv = &padapter->cmdpriv;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	psetop = kzalloc(sizeof(struct setopmode_parm), GFP_KERNEL);

	ph2c = kzalloc(sizeof(*ph2c), GFP_KERNEL);

	psetop = kzalloc(sizeof(*psetop), GFP_KERNEL);

	if (!ph2c || !psetop) {

		kfree(ph2c);

		kfree(psetop);
@@ -552,9 +552,9 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key) 
	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct sta_info *sta = (struct sta_info *)psta;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	psetstakey_para = kzalloc(sizeof(struct set_stakey_parm), GFP_KERNEL);

	psetstakey_rsp = kzalloc(sizeof(struct set_stakey_rsp), GFP_KERNEL);

	ph2c = kzalloc(sizeof(*ph2c), GFP_KERNEL);

	psetstakey_para = kzalloc(sizeof(*psetstakey_para), GFP_KERNEL);

	psetstakey_rsp = kzalloc(sizeof(*psetstakey_rsp), GFP_KERNEL);



	if (!ph2c || !psetstakey_para || !psetstakey_rsp) {

		kfree(ph2c);
@@ -597,20 +597,20 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue) 
	if (!enqueue) {

		clear_cam_entry(padapter, entry);

	} else {

		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

		ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

		if (!ph2c) {

			res = _FAIL;

			goto exit;

		}



		psetstakey_para = kzalloc(sizeof(struct set_stakey_parm), GFP_ATOMIC);

		psetstakey_para = kzalloc(sizeof(*psetstakey_para), GFP_ATOMIC);

		if (!psetstakey_para) {

			kfree(ph2c);

			res = _FAIL;

			goto exit;

		}



		psetstakey_rsp = kzalloc(sizeof(struct set_stakey_rsp), GFP_ATOMIC);

		psetstakey_rsp = kzalloc(sizeof(*psetstakey_rsp), GFP_ATOMIC);

		if (!psetstakey_rsp) {

			kfree(ph2c);

			kfree(psetstakey_para);
@@ -642,13 +642,13 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr) 
	struct addBaReq_parm *paddbareq_parm;

	u8	res = _SUCCESS;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	paddbareq_parm = kzalloc(sizeof(struct addBaReq_parm), GFP_ATOMIC);

	paddbareq_parm = kzalloc(sizeof(*paddbareq_parm), GFP_ATOMIC);

	if (!paddbareq_parm) {

		kfree(ph2c);

		res = _FAIL;
@@ -677,13 +677,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) 
	struct cmd_priv	*pcmdpriv = &padapter->cmdpriv;

	u8	res = _SUCCESS;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_ATOMIC);

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;
@@ -719,7 +719,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) 
	}



	/* prepare cmd parameter */

	setChannelPlan_param = kzalloc(sizeof(struct SetChannelPlan_param), GFP_KERNEL);

	setChannelPlan_param = kzalloc(sizeof(*setChannelPlan_param), GFP_KERNEL);

	if (!setChannelPlan_param) {

		res = _FAIL;

		goto exit;
@@ -728,7 +728,7 @@ u8 rtw_set_chplan_cmd(struct adapter *padapter, u8 chplan, u8 enqueue) 


	if (enqueue) {

		/* need enqueue, prepare cmd_obj and enqueue */

		pcmdobj = kzalloc(sizeof(struct	cmd_obj), GFP_KERNEL);

		pcmdobj = kzalloc(sizeof(*pcmdobj), GFP_KERNEL);

		if (!pcmdobj) {

			kfree(setChannelPlan_param);

			res = _FAIL;
@@ -883,13 +883,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) 
	u8	res = _SUCCESS;



	if (enqueue) {

		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

		ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

		if (!ph2c) {

			res = _FAIL;

			goto exit;

		}



		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

		pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_ATOMIC);

		if (!pdrvextra_cmd_parm) {

			kfree(ph2c);

			res = _FAIL;
@@ -925,13 +925,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time) 


	u8	res = _SUCCESS;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_ATOMIC);

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;
@@ -966,13 +966,13 @@ u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) 
		return res;



	if (enqueue) {

		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

		ph2c = kzalloc(sizeof(*ph2c), GFP_KERNEL);

		if (!ph2c) {

			res = _FAIL;

			goto exit;

		}



		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);

		pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_KERNEL);

		if (!pdrvextra_cmd_parm) {

			kfree(ph2c);

			res = _FAIL;
@@ -999,8 +999,8 @@ u8 rtw_ps_cmd(struct adapter *padapter) 
	struct drvextra_cmd_parm	*pdrvextra_cmd_parm;

	struct cmd_priv	*pcmdpriv = &padapter->cmdpriv;



	ppscmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	ppscmd = kzalloc(sizeof(*ppscmd), GFP_ATOMIC);

	pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_ATOMIC);

	if (!ppscmd || !pdrvextra_cmd_parm) {

		kfree(ppscmd);

		kfree(pdrvextra_cmd_parm);
@@ -1063,13 +1063,13 @@ u8 rtw_chk_hi_queue_cmd(struct adapter *padapter) 
	struct cmd_priv	*pcmdpriv = &padapter->cmdpriv;

	u8	res = _SUCCESS;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	ph2c = kzalloc(sizeof(*ph2c), GFP_ATOMIC);

	if (!ph2c) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	pdrvextra_cmd_parm = kzalloc(sizeof(*pdrvextra_cmd_parm), GFP_ATOMIC);

	if (!pdrvextra_cmd_parm) {

		kfree(ph2c);

		res = _FAIL;