Skip to contentSkip to conversation

RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

PATCH Applied Leon Romanovsky 2 participants 3 messages Mar 10, 2020

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

PATCH 1/1 RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

From: Erez Shitrit <[email protected]>

Those macros are already defined in include/linux/mlx5/driver.h, so delete their duplicate variants.

---
 drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/infiniband/hw/mlx5/mlx5_ib.h +0 -4
index aae88311e714..8eb9b5e29365 100644
@@ -126,10 +126,6 @@ enum mlx5_ib_mmap_type {
 	MLX5_IB_MMAP_TYPE_VAR = 2,
 };
 
-#define MLX5_LOG_SW_ICM_BLOCK_SIZE(dev)                                        \
-	(MLX5_CAP_DEV_MEM(dev, log_sw_icm_alloc_granularity))
-#define MLX5_SW_ICM_BLOCK_SIZE(dev) (1 << MLX5_LOG_SW_ICM_BLOCK_SIZE(dev))
-
 struct mlx5_ib_ucontext {
 	struct ib_ucontext	ibucontext;
 	struct list_head	db_page_list;
Signature · 1 line
2.24.1
#1 lore raw
Quoted 5 lines · Leon Romanovsky

From: Erez Shitrit <[email protected]>

Those macros are already defined in include/linux/mlx5/driver.h, so delete their duplicate variants.

Quoted 8 lines
---
 drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ----
 1 file changed, 4 deletions(-)

That is a long list of signed off by's for a two line patch..

Applied to for-next

Jason

#2 lore raw
Quoted 15 lines · Jason Gunthorpe
Quoted 5 lines · Leon Romanovsky

From: Erez Shitrit <[email protected]>

Those macros are already defined in include/linux/mlx5/driver.h, so delete their duplicate variants.

Quoted 8 lines
---
 drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ----
 1 file changed, 4 deletions(-)
Quoted 1 line

That is a long list of signed off by's for a two line patch..

Team work.

Quoted 4 lines

Applied to for-next

Jason