Skip to contentSkip to conversation

staging: most: dim2: replace ROUND_UP_TO macro with round_up()

PATCH In review Mark Adamenko 2 participants 2 messages Mar 6

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: most: dim2: replace ROUND_UP_TO macro with round_up()

The ROUND_UP_TO macro reuses argument 'd', which can cause unintended side effects. Remove it and replace the macro call with the existing round_up() function.

---
v2: use existing round_up() instead of a custom inline function

---
 drivers/staging/most/dim2/hal.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/most/dim2/hal.c +1 -3
index 6abe3ab2b2cf..ae9006703f23 100644
@@ -45,8 +45,6 @@
 #define DBR_SIZE  (16 * 1024) /* specified by IP */
 #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE)
 
-#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d))
-
 /* -------------------------------------------------------------------------- */
 /* generic helper functions and macros */
 
@@ -758,7 +756,7 @@ static u8 init_ctrl_async(struct dim_channel *ch, u8 type, u8 is_tx,
 		return DIM_INIT_ERR_CHANNEL_ADDRESS;
 
 	if (!ch->dbr_size)
-		ch->dbr_size = ROUND_UP_TO(hw_buffer_size, DBR_BLOCK_SIZE);
+		ch->dbr_size = round_up(hw_buffer_size, DBR_BLOCK_SIZE);
 	ch->dbr_addr = alloc_dbr(ch->dbr_size);
 	if (ch->dbr_addr >= DBR_SIZE)
 		return DIM_INIT_ERR_OUT_OF_MEMORY;
Signature · 1 line
2.53.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 7 lines · Mark Adamenko

The ROUND_UP_TO macro reuses argument 'd', which can cause unintended side effects. Remove it and replace the macro call with the existing round_up() function.

---
v2: use existing round_up() instead of a custom inline function

Thanks!

regards,
dan carpenter