[PATCH rdma-next] RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

[PATCH rdma-next] RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

[Leon Romanovsky]

From: Erez Shitrit <erezsh@mellanox.com>

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

Signed-off-by: Ariel Levkovich <lariel@mellanox.com>
Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
Reviewed-by: Alex Vesker <valex@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index aae88311e714..8eb9b5e29365 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -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;
-- 
2.24.1

Re: [PATCH rdma-next] RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

[Jason Gunthorpe]

On Tue, Mar 10, 2020 at 09:57:06AM +0200, Leon Romanovsky wrote:
> From: Erez Shitrit <erezsh@mellanox.com>
> 
> Those macros are already defined in include/linux/mlx5/driver.h,
> so delete their duplicate variants.
> 
> Signed-off-by: Ariel Levkovich <lariel@mellanox.com>
> Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
> Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
> Reviewed-by: Alex Vesker <valex@mellanox.com>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  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

Re: [PATCH rdma-next] RDMA/mlx5: Remove duplicate definitions of SW_ICM macros

[Leon Romanovsky]

On Tue, Mar 10, 2020 at 02:41:01PM -0300, Jason Gunthorpe wrote:
> On Tue, Mar 10, 2020 at 09:57:06AM +0200, Leon Romanovsky wrote:
> > From: Erez Shitrit <erezsh@mellanox.com>
> >
> > Those macros are already defined in include/linux/mlx5/driver.h,
> > so delete their duplicate variants.
> >
> > Signed-off-by: Ariel Levkovich <lariel@mellanox.com>
> > Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
> > Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
> > Reviewed-by: Alex Vesker <valex@mellanox.com>
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> > ---
> >  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..

Team work.

>
> Applied to for-next
>
> Jason