From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 2/5] staging: r8188eu: use round_up() instead of _RND4()
Date: Wed, 6 Apr 2022 19:22:16 +0200 [thread overview]
Message-ID: <20220406172219.15565-3-straube.linux@gmail.com> (raw)
In-Reply-To: <20220406172219.15565-1-straube.linux@gmail.com>
Use in-kernel round_up() instead of custom _RND4().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v2: no changes
drivers/staging/r8188eu/core/rtw_cmd.c | 2 +-
drivers/staging/r8188eu/include/osdep_service.h | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index ecd0488c439b..4977a0b99415 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -264,7 +264,7 @@ int rtw_cmd_thread(void *context)
goto post_process;
}
- pcmd->cmdsz = _RND4((pcmd->cmdsz));/* _RND4 */
+ pcmd->cmdsz = round_up(pcmd->cmdsz, 4);
memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 56e5cbfec1f1..388c22751d09 100644
--- a/drivers/staging/r8188eu/include/osdep_service.h
+++ b/drivers/staging/r8188eu/include/osdep_service.h
@@ -96,14 +96,6 @@ static inline void flush_signals_thread(void)
#define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r))
-static inline u32 _RND4(u32 sz)
-{
- u32 val;
-
- val = ((sz >> 2) + ((sz & 3) ? 1: 0)) << 2;
- return val;
-}
-
static inline u32 _RND8(u32 sz)
{
u32 val;
--
2.35.1
next prev parent reply other threads:[~2022-04-06 17:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 17:22 [PATCH v2 0/5] staging: r8188eu: use round_up() Michael Straube
2022-04-06 17:22 ` [PATCH v2 1/5] staging: r8188eu: use PTR_ALIGN() instead of RND4() Michael Straube
2022-04-06 17:22 ` Michael Straube [this message]
2022-04-06 17:22 ` [PATCH v2 3/5] staging: r8188eu: use round_up() instead of _RND8() Michael Straube
2022-04-07 8:36 ` David Laight
2022-04-06 17:22 ` [PATCH v2 4/5] staging: r8188eu: use round_up() instead of _RND128() Michael Straube
2022-04-06 17:22 ` [PATCH v2 5/5] staging: r8188eu: remove unused _RND* from osdep_service.h Michael Straube
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=20220406172219.15565-3-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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).