Commit 92d995d1 authored by Vihas Makwana's avatar Vihas Makwana Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: drop unnecessary wrapper _rtw_dequeue_cmd 



Drop unnecessary wrapper _rtw_dequeue_cmd and move its logic to
rtw_dequeue_cmd.

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-8-makvihas@gmail.com


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

drivers/staging/r8188eu/core/rtw_cmd.c

+13 −21
Original line number Diff line number Diff line
@@ -56,24 +56,6 @@ static int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) 
	return _SUCCESS;

}



static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)

{

	struct cmd_obj *obj;

	unsigned long flags;



	spin_lock_irqsave(&queue->lock, flags);

	if (list_empty(&queue->queue)) {

		obj = NULL;

	} else {

		obj = container_of((&queue->queue)->next, struct cmd_obj, list);

		list_del_init(&obj->list);

	}



	spin_unlock_irqrestore(&queue->lock, flags);



	return obj;

}



u32	rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)

{

	u32 res = _SUCCESS;
@@ -180,11 +162,21 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) 


struct	cmd_obj	*rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)

{

	struct cmd_obj *cmd_obj;

	struct cmd_obj *obj;

	struct __queue *queue = &pcmdpriv->cmd_queue;

	unsigned long flags;



	spin_lock_irqsave(&queue->lock, flags);

	if (list_empty(&queue->queue)) {

		obj = NULL;

	} else {

		obj = container_of((&queue->queue)->next, struct cmd_obj, list);

		list_del_init(&obj->list);

	}



	cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);

	spin_unlock_irqrestore(&queue->lock, flags);



	return cmd_obj;

	return obj;

}



void rtw_free_cmd_obj(struct cmd_obj *pcmd)