diff options
| author | James A Shackleford <shack@linux.com> | 2014-06-22 20:27:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 20:31:02 -0400 |
| commit | d913e54ef08da6f831df47a45f2ca1b11579eba4 (patch) | |
| tree | e1115a5a258053d8df1bf38de4cdead5a6415d2d /drivers/staging/rtl8712 | |
| parent | 83543d328f7a8285d3627b4ed7d14bf16f439ad4 (diff) | |
| download | blackbird-obmc-linux-d913e54ef08da6f831df47a45f2ca1b11579eba4.tar.gz blackbird-obmc-linux-d913e54ef08da6f831df47a45f2ca1b11579eba4.zip | |
staging: rtl8712: remove inline _RND8() and use round_up()
Signed-off-by: James A Shackleford <shack@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 09e156199e7f..6af0df9c04e7 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 8ca7d7e68dca..4998fde3ec82 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); |
