From: Vihas Makwana <makvihas@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michael Straube <straube.linux@gmail.com>
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Pavel Skripkin <paskripkin@gmail.com>,
Vihas Makwana <makvihas@gmail.com>
Subject: [PATCH 4/6] staging: r8188eu: drop unnecessary wrapper rtw_dequeue_cmd
Date: Sun, 10 Apr 2022 22:01:15 +0530 [thread overview]
Message-ID: <20220410163117.3964-5-makvihas@gmail.com> (raw)
In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com>
Remove the unnecessary wrapper. The logic of rtw_dequeue_cmd can
be moved to _rtw_dequeue_cmd.
Signed-off-by: Vihas Makwana <makvihas@gmail.com>
---
drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++++------------
drivers/staging/r8188eu/include/rtw_cmd.h | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index ac6e710e5..9d1beca43 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -121,10 +121,11 @@ 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 *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
{
struct cmd_obj *obj;
unsigned long flags;
+ struct __queue *queue = &pcmdpriv->cmd_queue;
spin_lock_irqsave(&queue->lock, flags);
if (list_empty(&queue->queue)) {
@@ -178,15 +179,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
return res;
}
-struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv)
-{
- struct cmd_obj *cmd_obj;
-
- cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue);
-
- return cmd_obj;
-}
-
void rtw_free_cmd_obj(struct cmd_obj *pcmd)
{
@@ -230,7 +222,7 @@ int rtw_cmd_thread(void *context)
padapter->bSurpriseRemoved)
break;
- pcmd = rtw_dequeue_cmd(pcmdpriv);
+ pcmd = _rtw_dequeue_cmd(pcmdpriv);
if (!pcmd)
continue;
@@ -280,7 +272,7 @@ int rtw_cmd_thread(void *context)
/* free all cmd_obj resources */
do {
- pcmd = rtw_dequeue_cmd(pcmdpriv);
+ pcmd = _rtw_dequeue_cmd(pcmdpriv);
if (!pcmd)
break;
diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8188eu/include/rtw_cmd.h
index 7edce0f88..d581deebb 100644
--- a/drivers/staging/r8188eu/include/rtw_cmd.h
+++ b/drivers/staging/r8188eu/include/rtw_cmd.h
@@ -77,7 +77,7 @@ struct c2h_evt_hdr {
#define c2h_evt_exist(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen)
u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj);
-struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv);
+struct cmd_obj *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv);
void rtw_free_cmd_obj(struct cmd_obj *pcmd);
int rtw_cmd_thread(void *context);
--
2.30.2
next prev parent reply other threads:[~2022-04-10 16:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-10 16:31 [PATCH 0/6] drop some unnecessary wrappers Vihas Makwana
2022-04-10 16:31 ` [PATCH 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv Vihas Makwana
2022-04-10 17:07 ` Joe Perches
2022-04-10 17:38 ` Vihas Makwana
2022-04-11 8:06 ` Dan Carpenter
2022-04-10 16:31 ` [PATCH 2/6] staging: r8188eu: drop unnecessary wrapper rtw_init_cmd_priv Vihas Makwana
2022-04-10 16:31 ` [PATCH 3/6] staging: r8188eu: drop unnecessary wrapper rtw_init_evt_priv Vihas Makwana
2022-04-10 16:31 ` Vihas Makwana [this message]
2022-04-10 16:31 ` [PATCH 5/6] staging: r8188eu: drop unnecessary wrapper rtw_init_mlme_priv Vihas Makwana
2022-04-10 16:31 ` [PATCH 6/6] staging: r8188eu: drop unnecessary wrapper rtw_free_mlme_priv Vihas Makwana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220410163117.3964-5-makvihas@gmail.com \
--to=makvihas@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®