staging: vt6656: Use DIV_ROUND_UP macro instead of specific code
PATCH 1/1 staging: vt6656: Use DIV_ROUND_UP macro instead of specific code
Use DIV_ROUND_UP macro instead of specific code with the same purpose. Also, remove the unused variables.
--- drivers/staging/vt6656/baseband.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/staging/vt6656/baseband.c +4 -17
@@ -22,6 +22,7 @@* */ +#include <linux/kernel.h> #include "mac.h" #include "baseband.h" #include "rf.h"
@@ -132,7 +133,6 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type, {unsigned int frame_time;unsigned int preamble; -unsigned int tmp;unsigned int rate =0 ;if (tx_rate >RATE_54M )
@@ -146,20 +146,11 @@ unsigned int vnt_get_frame_time(u8 preamble_type, u8 pkt_type,else preamble =192 ; - frame_time = (frame_length *80 ) / rate; - tmp = (frame_time * rate) /80 ; - -if (frame_length != tmp) - frame_time++; - + frame_time =DIV_ROUND_UP (frame_length *80 , rate);return preamble + frame_time; } - frame_time = (frame_length *8 +22 ) / rate; - tmp = ((frame_time * rate) -22 ) /8 ; - -if (frame_length != tmp) - frame_time++; + frame_time =DIV_ROUND_UP (frame_length *8 +22 , rate); frame_time = frame_time *4 ;if (pkt_type !=PK_TYPE_11A )
@@ -213,11 +204,7 @@ void vnt_get_phy_field(struct vnt_private *priv, u32 frame_length,break ;case RATE_5M : - count = (bit_count *10 ) /55 ; - tmp = (count *55 ) /10 ; - -if (tmp != bit_count) - count++; + count =DIV_ROUND_UP (bit_count *10 ,55 );if (preamble_type ==1 ) phy->signal =0x0a ;
--
2.20.1
Greg Kroah-Hartman
maintainerQuoted 7 lines · Oscar Carter
Use
DIV_ROUND_UPmacro instead of specific code with the same purpose. Also, remove the unused variables.Signed-off-by Oscar Carter <[email protected]>--- drivers/staging/vt6656/baseband.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
Please rebase this against my staging-next branch of my staging.git tree and resend it as it does not apply to it at the moment at all.
thanks,
greg k-h
Quoted 4 lines · Greg Kroah-Hartman
Quoted 3 lines · Oscar Carter
Use
DIV_ROUND_UPmacro instead of specific code with the same purpose. Also, remove the unused variables.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Oscar Carter <[email protected]>--- drivers/staging/vt6656/baseband.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)Please rebase this against my staging-next branch of my staging.git tree and resend it as it does not apply to it at the moment at all.
Ok, I rebase against your staging-next branch and I resend the patch as a new version.
Quoted 3 lines
thanks,
greg k-h