From: Martin Kaiser <martin@kaiser.cx>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 06/10] staging: rtl8188eu: clean up rtw_recv_entry
Date: Wed, 7 Apr 2021 19:05:27 +0200 [thread overview]
Message-ID: <20210407170531.29356-6-martin@kaiser.cx> (raw)
In-Reply-To: <20210407170531.29356-1-martin@kaiser.cx>
Change the return type to int, the function returns 0 or 1.
Remove the goto statement, we're not doing any cleanup on exit.
Summarize variable declarations and assignments.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/rtl8188eu/core/rtw_recv.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index b9b4bc435037..b2fe448d999d 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1962,27 +1962,18 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe)
return ret;
}
-s32 rtw_recv_entry(struct recv_frame *precvframe)
+int rtw_recv_entry(struct recv_frame *precvframe)
{
- struct adapter *padapter;
- struct recv_priv *precvpriv;
- s32 ret = _SUCCESS;
-
- padapter = precvframe->adapter;
-
- precvpriv = &padapter->recvpriv;
+ struct adapter *padapter = precvframe->adapter;
+ struct recv_priv *precvpriv = &padapter->recvpriv;
+ int ret;
ret = recv_func(padapter, precvframe);
- if (ret == _FAIL) {
+ if (ret == _SUCCESS)
+ precvpriv->rx_pkts++;
+ else
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("%s: recv_func return fail!!!\n", __func__));
- goto _recv_entry_drop;
- }
-
- precvpriv->rx_pkts++;
-
- return ret;
-_recv_entry_drop:
return ret;
}
--
2.20.1
next prev parent reply other threads:[~2021-04-07 17:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 17:05 [PATCH 01/10] staging: rtl8188eu: remove unused macros Martin Kaiser
2021-04-07 17:05 ` [PATCH 02/10] staging: rtl8188eu: remove unnecessary brackets Martin Kaiser
2021-04-07 17:05 ` [PATCH 03/10] staging: rtl8188eu: remove unused defines Martin Kaiser
2021-04-07 17:05 ` [PATCH 04/10] staging: rtl8188eu: move defines into the .c file Martin Kaiser
2021-04-07 17:05 ` [PATCH 05/10] staging: rtl8188eu: set pipe only once Martin Kaiser
2021-04-07 17:05 ` Martin Kaiser [this message]
2021-04-07 17:05 ` [PATCH 07/10] staging: rtl8188eu: remove unnecessary variable Martin Kaiser
2021-04-07 17:05 ` [PATCH 08/10] staging: rtl8188eu: rtw_usb_if1_init needs no dvobj parameter Martin Kaiser
2021-04-07 17:05 ` [PATCH 09/10] staging: rtl8188eu: make usb_dvobj_init return a status Martin Kaiser
2021-04-07 17:05 ` [PATCH 10/10] staging: rtl8188eu: make rtw_usb_if1_init " Martin Kaiser
2021-04-08 7:26 ` [PATCH 01/10] staging: rtl8188eu: remove unused macros Greg Kroah-Hartman
2021-04-08 19:52 ` Martin Kaiser
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=20210407170531.29356-6-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).