2014-06-23 00:42:11

by James A Shackleford

Subject: [PATCH 1/4] staging: rtl8712: remove inline _RND8() and use round_up()

Signed-off-by: James A Shackleford <[email protected]>
---
drivers/staging/rtl8712/osdep_service.h | 5 -----
drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 09e1561..6af0df9 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -184,11 +184,6 @@ static inline void flush_signals_thread(void)
flush_signals(current);
}

-static inline u32 _RND8(u32 sz)
-{
- return ((sz >> 3) + ((sz & 7) ? 1 : 0)) << 3;
-}
-
static inline u32 _RND128(u32 sz)
{
return ((sz >> 7) + ((sz & 127) ? 1 : 0)) << 7;
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index 8ca7d7e..4998fde 100644
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -351,7 +351,7 @@ _next:
&padapter->dvobjpriv;
u8 blnPending = 0;
pcmdpriv->cmd_issued_cnt++;
- cmdsz = _RND8((pcmd->cmdsz)); /* _RND8 */
+ cmdsz = round_up(pcmd->cmdsz, 8);
wr_sz = TXDESC_SIZE + 8 + cmdsz;
pdesc->txdw0 |= cpu_to_le32((wr_sz-TXDESC_SIZE) &
0x0000ffff);
--
1.7.9.5

2014-06-23 00:42:22

by James A Shackleford

Subject: [PATCH 2/4] staging: rtl8712: remove inline _RND128() and use round_up()

Signed-off-by: James A Shackleford <[email protected]>
---
drivers/staging/rtl8712/osdep_service.h | 5 -----
drivers/staging/rtl8712/rtl8712_recv.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 6af0df9..37ec56b 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -184,11 +184,6 @@ static inline void flush_signals_thread(void)
flush_signals(current);
}

-static inline u32 _RND128(u32 sz)
-{
- return ((sz >> 7) + ((sz & 127) ? 1 : 0)) << 7;
-}
-
static inline u32 _RND256(u32 sz)
{
return ((sz >> 8) + ((sz & 255) ? 1 : 0)) << 8;
diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index 1f70017..fb947c1 100644
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -1065,7 +1065,7 @@ static int recvbuf2recvframe(struct _adapter *padapter, struct sk_buff *pskb)
precvframe->u.hdr.precvbuf = NULL; /*can't access the precvbuf*/
precvframe->u.hdr.len = 0;
tmp_len = pkt_len + drvinfo_sz + RXDESC_SIZE;
- pkt_offset = (u16)_RND128(tmp_len);
+ pkt_offset = (u16)round_up(tmp_len, 128);
/* for first fragment packet, driver need allocate 1536 +
* drvinfo_sz + RXDESC_SIZE to defrag packet. */
if ((mf == 1) && (frag == 0))
--
1.7.9.5

2014-06-23 00:42:25

by James A Shackleford

Subject: [PATCH 3/4] staging: rtl8712: remove unused inline _RND256()

Signed-off-by: James A Shackleford <[email protected]>
---
drivers/staging/rtl8712/osdep_service.h | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 37ec56b..9316eab 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -184,11 +184,6 @@ static inline void flush_signals_thread(void)
flush_signals(current);
}

-static inline u32 _RND256(u32 sz)
-{
- return ((sz >> 8) + ((sz & 255) ? 1 : 0)) << 8;
-}
-
static inline u32 _RND512(u32 sz)
{
return ((sz >> 9) + ((sz & 511) ? 1 : 0)) << 9;
--
1.7.9.5

2014-06-23 00:42:34

by James A Shackleford

Subject: [PATCH 4/4] staging: rtl8712: remove unused inline _RND512()

Signed-off-by: James A Shackleford <[email protected]>
---
drivers/staging/rtl8712/osdep_service.h | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 9316eab..425f0f1 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -184,10 +184,5 @@ static inline void flush_signals_thread(void)
flush_signals(current);
}

-static inline u32 _RND512(u32 sz)
-{
- return ((sz >> 9) + ((sz & 511) ? 1 : 0)) << 9;
-}
-
#endif

--
1.7.9.5