IB/mlx5: Remove duplicate header inclusion related to ODP
Subsystems (2)
PATCH 1/1 IB/mlx5: Remove duplicate header inclusion related to ODP
rdma/ib_umem.h and rdma/ib_verbs.h are included by rdma/ib_umem_odp.h. This patch removes the redundant entries.
Signed-off-by Daisuke Matsuda <[email protected]>
--- drivers/infiniband/core/umem_odp.c | 2 -- drivers/infiniband/hw/mlx5/main.c | 3 +-- drivers/infiniband/hw/mlx5/mem.c | 1 - drivers/infiniband/hw/mlx5/mr.c | 2 -- drivers/infiniband/hw/mlx5/odp.c | 1 - 5 files changed, 1 insertion(+), 8 deletions(-)
drivers/infiniband/core/umem_odp.c +0 -2
@@ -43,8 +43,6 @@#include <linux/hmm.h> #include <linux/pagemap.h> -#include <rdma/ib_verbs.h> -#include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> #include "uverbs.h"
drivers/infiniband/hw/mlx5/main.c +1 -2
@@ -26,7 +26,7 @@#include <linux/mlx5/eswitch.h> #include <linux/list.h> #include <rdma/ib_smi.h> -#include <rdma/ib_umem.h> +#include <rdma/ib_umem_odp.h> #include <rdma/lag.h> #include <linux/in.h> #include <linux/etherdevice.h>
@@ -46,7 +46,6 @@#include <rdma/uverbs_ioctl.h> #include <rdma/mlx5_user_ioctl_verbs.h> #include <rdma/mlx5_user_ioctl_cmds.h> -#include <rdma/ib_umem_odp.h> #define UVERBS_MODULE_NAME mlx5_ib#include <rdma/uverbs_named_ioctl.h>
drivers/infiniband/hw/mlx5/mem.c +0 -1
@@ -30,7 +30,6 @@* SOFTWARE. */ -#include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> #include "mlx5_ib.h" #include <linux/jiffies.h>
drivers/infiniband/hw/mlx5/mr.c +0 -2
@@ -39,9 +39,7 @@#include <linux/delay.h> #include <linux/dma-buf.h> #include <linux/dma-resv.h> -#include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> -#include <rdma/ib_verbs.h> #include "dm.h" #include "mlx5_ib.h" #include "umr.h"
drivers/infiniband/hw/mlx5/odp.c +0 -1
@@ -30,7 +30,6 @@* SOFTWARE. */ -#include <rdma/ib_umem.h> #include <rdma/ib_umem_odp.h> #include <linux/kernel.h> #include <linux/dma-buf.h>
Signature · 1 line
2.25.1
Leon Romanovsky
AppliedQuoted 11 lines · Daisuke Matsuda
rdma/ib_umem.handrdma/ib_verbs.hare included byrdma/ib_umem_odp.h. This patch removes the redundant entries.Signed-off-by Daisuke Matsuda <[email protected]>--- drivers/infiniband/core/umem_odp.c | 2 -- drivers/infiniband/hw/mlx5/main.c | 3 +-- drivers/infiniband/hw/mlx5/mem.c | 1 - drivers/infiniband/hw/mlx5/mr.c | 2 -- drivers/infiniband/hw/mlx5/odp.c | 1 - 5 files changed, 1 insertion(+), 8 deletions(-)
I have mixed feelings about this change.
Thanks, applied.