From: Erez Shitrit Date: Tue, 10 Mar 2020 07:57:06 +0000 (+0200) Subject: RDMA/mlx5: Remove duplicate definitions of SW_ICM macros X-Git-Tag: v5.15~4184^2~69 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0897f301bc285409ab6453839fa6a43d9ceb26e0;p=platform%2Fkernel%2Flinux-starfive.git RDMA/mlx5: Remove duplicate definitions of SW_ICM macros Those macros are already defined in include/linux/mlx5/driver.h, so delete their duplicate variants. Link: https://lore.kernel.org/r/20200310075706.238592-1-leon@kernel.org Signed-off-by: Ariel Levkovich Signed-off-by: Yevgeny Kliteynik Signed-off-by: Erez Shitrit Reviewed-by: Alex Vesker Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe --- diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h index 798366b..2e42258 100644 --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h @@ -128,10 +128,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;