staging: r8188eu: use round_up() instead of _RND8()

Use in-kernel round_up() instead of custom _RND8().
Just remove _RND8 where it is not necessary to round up.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220407125742.7814-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 9bd2428514de91f7d357794d74c9e8eb592c80a9..bdfa5194928976aeead1b80b20375ab8c5d0fff8 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -437,7 +437,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
        pfirstframe = pxmitframe;
        len = xmitframe_need_length(pfirstframe) + TXDESC_SIZE + (pfirstframe->pkt_offset * PACKET_OFFSET_SZ);
        pbuf_tail = len;
-       pbuf = _RND8(pbuf_tail);
+       pbuf = round_up(pbuf_tail, 8);
 
        /*  check pkt amount in one bulk */
        desc_cnt = 0;
@@ -488,7 +488,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
 
                len = xmitframe_need_length(pxmitframe) + TXDESC_SIZE + (pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
 
-               if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) {
+               if (pbuf + len > MAX_XMITBUF_SZ) {
                        pxmitframe->agg_num = 1;
                        pxmitframe->pkt_offset = 1;
                        break;
@@ -511,7 +511,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
 
                /*  handle pointer and stop condition */
                pbuf_tail = pbuf + len;
-               pbuf = _RND8(pbuf_tail);
+               pbuf = round_up(pbuf_tail, 8);
 
                pfirstframe->agg_num++;
                if (MAX_TX_AGG_PACKET_NUMBER == pfirstframe->agg_num)

diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h
index 388c22751d0915c1c748f2f04dcce3db7e717ac8..ff44c4a37b9dd77fd7eecab5052a2ef22064bdc0 100644 (file)
--- 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 _RND8(u32 sz)
-{
-       u32     val;
-
-       val = ((sz >> 3) + ((sz & 7) ? 1: 0)) << 3;
-       return val;
-}
-
 static inline u32 _RND128(u32 sz)
 {
        u32     val;