[PATCH v2 2/5] staging: r8188eu: use round_up() instead of _RND4()

From: Michael Straube
Date: Wed Apr 06 2022 - 15:45:00 EST


Use in-kernel round_up() instead of custom _RND4().

Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
---
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