From: Pavel Skripkin <paskripkin@gmail.com>
To: Phillip Potter <phil@philpotter.co.uk>, gregkh@linuxfoundation.org
Cc: straube.linux@gmail.com, fmdefrancesco@gmail.com,
Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] staging: r8188eu: simplify c2h_evt_hdl function
Date: Sun, 29 Aug 2021 14:54:14 +0300 [thread overview]
Message-ID: <19b08be7-964e-fdbc-93c8-825ad41e1ade@gmail.com> (raw)
In-Reply-To: <20210828212453.898-3-phil@philpotter.co.uk>
On 8/29/21 12:24 AM, Phillip Potter wrote:
> Simplify c2h_evt_hdl function by removing majority of its code. The
> function always returns _FAIL anyway, due to the wrapper function it
> calls always returning _FAIL. For this reason, it is better to just
> return _FAIL directly.
>
> Leave the call to c2h_evt_read in place, as without it, event handling
> semantics of the driver would be changed, despite nothing actually being
> done with the event.
>
> Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
> ---
> drivers/staging/r8188eu/core/rtw_cmd.c | 21 +++------------------
> 1 file changed, 3 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
> index ce73ac7cf973..b520c6b43c03 100644
> --- a/drivers/staging/r8188eu/core/rtw_cmd.c
> +++ b/drivers/staging/r8188eu/core/rtw_cmd.c
> @@ -1854,27 +1854,12 @@ u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt)
>
> static s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
> {
> - s32 ret = _FAIL;
> u8 buf[16];
>
> - if (!c2h_evt) {
> - /* No c2h event in cmd_obj, read c2h event before handling*/
> - if (c2h_evt_read(adapter, buf) == _SUCCESS) {
> - c2h_evt = (struct c2h_evt_hdr *)buf;
> + if (!c2h_evt)
> + c2h_evt_read(adapter, buf);
>
> - if (filter && !filter(c2h_evt->id))
> - goto exit;
> -
> - ret = rtw_hal_c2h_handler(adapter, c2h_evt);
> - }
> - } else {
> - if (filter && !filter(c2h_evt->id))
> - goto exit;
> -
> - ret = rtw_hal_c2h_handler(adapter, c2h_evt);
> - }
> -exit:
> - return ret;
> + return _FAIL;
Hi, Phillip!
Do we really need to return _FAIL every time? The only one caller of
c2h_evt_hdl() does not rely on it's return value. Shouldn't we make this
function return void to simplify the code?
BTW, this function does nothing now, as I understand. It reads to local
buffer and returns. I think, it can be removed
> }
>
> static void c2h_wk_callback(struct work_struct *work)
>
With regards,
Pavel Skripkin
next prev parent reply other threads:[~2021-08-29 11:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-28 21:24 [PATCH 0/3] staging: r8188eu: cleanup c2h_handler code Phillip Potter
2021-08-28 21:24 ` [PATCH 1/3] staging: r8188eu: remove c2h_handler field from struct hal_ops Phillip Potter
2021-08-28 21:24 ` [PATCH 2/3] staging: r8188eu: simplify c2h_evt_hdl function Phillip Potter
2021-08-29 8:52 ` Fabio M. De Francesco
2021-08-29 10:49 ` Phillip Potter
2021-08-29 12:35 ` Fabio M. De Francesco
2021-08-29 11:54 ` Pavel Skripkin [this message]
2021-08-29 23:18 ` Phillip Potter
2021-08-30 8:06 ` Pavel Skripkin
2021-08-28 21:24 ` [PATCH 3/3] staging: r8188eu: remove rtw_hal_c2h_handler function Phillip Potter
2021-08-29 12:48 ` [PATCH 0/3] staging: r8188eu: cleanup c2h_handler code Fabio M. De Francesco
2021-08-29 22:59 ` Phillip Potter
2021-08-29 15:04 ` Michael Straube
2021-08-29 22:57 ` Phillip Potter
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=19b08be7-964e-fdbc-93c8-825ad41e1ade@gmail.com \
--to=paskripkin@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--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;
as well as URLs for NNTP newsgroup(s).