Commit 046bd5c9 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace _RND4 with round_up() 



Use round_up instead of inline _RND4.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201004011743.10750-2-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 87fe08d7

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ _next: 


		pcmdpriv->cmd_issued_cnt++;



		pcmd->cmdsz = _RND4((pcmd->cmdsz));/* _RND4 */

		pcmd->cmdsz = round_up((pcmd->cmdsz), 4);



		memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);

drivers/staging/rtl8723bs/hal/sdio_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static u32 sdio_write_port( 
		return _FAIL;

	}



	cnt = _RND4(cnt);

	cnt = round_up(cnt, 4);

	HalSdioGetCmdAddr8723BSdio(adapter, addr, cnt >> 2, &addr);



	if (cnt > psdio->block_transfer_len)

drivers/staging/rtl8723bs/include/osdep_service.h

+0 −11
Original line number Diff line number Diff line
@@ -132,17 +132,6 @@ static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *par 


#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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE