Commit 356eebb8 authored by Vihas Makwana's avatar Vihas Makwana Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: drop unnecessary wrapper _rtw_init_cmd_priv 



Drop unnecessary wrapper _rtw_init_cmd_priv and move its logic to
rtw_init_cmd_priv.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarVihas Makwana <makvihas@gmail.com>
Link: https://lore.kernel.org/r/20220422193223.11948-3-makvihas@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e46f80cb

drivers/staging/r8188eu/core/rtw_cmd.c

+34 −43
Original line number Diff line number Diff line
@@ -15,47 +15,6 @@ 
 * No irqsave is necessary.

 */



static int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

{

	int res = _SUCCESS;



	init_completion(&pcmdpriv->enqueue_cmd);

	/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */

	init_completion(&pcmdpriv->start_cmd_thread);

	init_completion(&pcmdpriv->stop_cmd_thread);



	rtw_init_queue(&pcmdpriv->cmd_queue);



	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */



	pcmdpriv->cmd_seq = 1;



	pcmdpriv->cmd_allocated_buf = kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ,

					      GFP_KERNEL);



	if (!pcmdpriv->cmd_allocated_buf) {

		res = _FAIL;

		goto exit;

	}



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



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



	if (!pcmdpriv->rsp_allocated_buf) {

		res = _FAIL;

		goto exit;

	}



	pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf  +  4 - ((size_t)(pcmdpriv->rsp_allocated_buf) & 3);



	pcmdpriv->cmd_done_cnt = 0;

	pcmdpriv->rsp_cnt = 0;

exit:



	return res;

}



static void c2h_wk_callback(struct work_struct *work);



static int _rtw_init_evt_priv(struct evt_priv *pevtpriv)
@@ -133,9 +92,41 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) 


u32	rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

{

	u32	res;

	u32 res = _SUCCESS;



	init_completion(&pcmdpriv->enqueue_cmd);

	/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */

	init_completion(&pcmdpriv->start_cmd_thread);

	init_completion(&pcmdpriv->stop_cmd_thread);



	rtw_init_queue(&pcmdpriv->cmd_queue);



	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */



	pcmdpriv->cmd_seq = 1;



	pcmdpriv->cmd_allocated_buf = kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ,

					      GFP_KERNEL);



	if (!pcmdpriv->cmd_allocated_buf) {

		res = _FAIL;

		goto exit;

	}



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



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



	if (!pcmdpriv->rsp_allocated_buf) {

		res = _FAIL;

		goto exit;

	}



	res = _rtw_init_cmd_priv(pcmdpriv);

	pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf  +  4 - ((size_t)(pcmdpriv->rsp_allocated_buf) & 3);



	pcmdpriv->cmd_done_cnt = 0;

	pcmdpriv->rsp_cnt = 0;

exit:



	return res;

}