* [PATCH] IB/mlx5: Remove duplicate header inclusion related to ODP
@ 2022-08-23 2:51 Daisuke Matsuda
2022-08-23 8:20 ` Leon Romanovsky
0 siblings, 1 reply; 2+ messages in thread
From: Daisuke Matsuda @ 2022-08-23 2:51 UTC (permalink / raw)
To: leonro, jgg; +Cc: linux-rdma, Daisuke Matsuda
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 <matsuda-daisuke@fujitsu.com>
---
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(-)
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c
index 186ed8859920..c459c4d011cf 100644
--- a/drivers/infiniband/core/umem_odp.c
+++ b/drivers/infiniband/core/umem_odp.c
@@ -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"
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 7c40efae96a3..e5b5310f6768 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -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>
diff --git a/drivers/infiniband/hw/mlx5/mem.c b/drivers/infiniband/hw/mlx5/mem.c
index 6b29e9ca323e..96ffbbaf0a73 100644
--- a/drivers/infiniband/hw/mlx5/mem.c
+++ b/drivers/infiniband/hw/mlx5/mem.c
@@ -30,7 +30,6 @@
* SOFTWARE.
*/
-#include <rdma/ib_umem.h>
#include <rdma/ib_umem_odp.h>
#include "mlx5_ib.h"
#include <linux/jiffies.h>
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 129d531bd01b..bfec9bc3cdd8 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -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"
diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 901a8b030236..bc97958818bb 100644
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -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>
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] IB/mlx5: Remove duplicate header inclusion related to ODP
2022-08-23 2:51 [PATCH] IB/mlx5: Remove duplicate header inclusion related to ODP Daisuke Matsuda
@ 2022-08-23 8:20 ` Leon Romanovsky
0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2022-08-23 8:20 UTC (permalink / raw)
To: Daisuke Matsuda; +Cc: jgg, linux-rdma
On Tue, Aug 23, 2022 at 02:51:31AM +0000, Daisuke Matsuda wrote:
> 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 <matsuda-daisuke@fujitsu.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-23 8:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-23 2:51 [PATCH] IB/mlx5: Remove duplicate header inclusion related to ODP Daisuke Matsuda
2022-08-23 8:20 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).