浏览代码

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>
James A Shackleford 11 年之前
父节点
当前提交
d913e54ef0
共有 2 个文件被更改,包括 1 次插入6 次删除
  1. 0 5
      drivers/staging/rtl8712/osdep_service.h
  2. 1 1
      drivers/staging/rtl8712/rtl8712_cmd.c

+ 0 - 5
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;

+ 1 - 1
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);