git: 19371d53348d - stable/13 - mlx5ib: idiomatic use of preprocessor, in particular paths

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Tue, 08 Feb 2022 06:55:55 UTC
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=19371d53348d84d353486768a71a041c9de7bca5

commit 19371d53348d84d353486768a71a041c9de7bca5
Author:     Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-06-14 11:10:30 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-08 06:42:07 +0000

    mlx5ib: idiomatic use of preprocessor, in particular paths
    
    (cherry picked from commit 028130b8e466e96365efaa898adf4ff2d01a2ea9)
---
 sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c       | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c     | 3 +--
 sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c       | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c      | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c      | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c     | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c      | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c       | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c       | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c      | 2 +-
 sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c     | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
index ce3ef156147a..8371f2b808b2 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
@@ -28,7 +28,7 @@
 #include "opt_rss.h"
 #include "opt_ratelimit.h"
 
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 static struct ib_ah *create_ib_ah(struct mlx5_ib_dev *dev,
 				  struct mlx5_ib_ah *ah,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
index afc2609919fb..da2fe114a35e 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
@@ -28,8 +28,7 @@
 #include "opt_rss.h"
 #include "opt_ratelimit.h"
 
-#include "mlx5_ib.h"
-
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 #include <dev/mlx5/cmd.h>
 
 static const char *mlx5_ib_cong_params_desc[] = {
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
index 26bc8f70779f..9ce8941bbc6f 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
@@ -32,7 +32,7 @@
 #include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 #include <rdma/ib_cache.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe __unused)
 {
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
index 04579fbc2346..5e7c4d1e914b 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c
@@ -32,7 +32,7 @@
 #include <linux/slab.h>
 #include <rdma/ib_umem.h>
 
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 struct mlx5_ib_user_db_page {
 	struct list_head	list;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
index cb9b5cfabf48..dc273bf5d179 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c
@@ -28,7 +28,7 @@
 #include "opt_rss.h"
 #include "opt_ratelimit.h"
 
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 struct mlx5_ib_gsi_wr {
 	struct ib_cqe cqe;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
index 6abca62ebe47..155f6b88e675 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c
@@ -32,7 +32,7 @@
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
 #include <rdma/ib_pma.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 enum {
 	MLX5_IB_VENDOR_CLASS1 = 0x9,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
index 23fc38424d02..f517dfc58fac 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
@@ -51,7 +51,7 @@
 #include <linux/in.h>
 #include <linux/etherdevice.h>
 #include <dev/mlx5/fs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 MODULE_DESCRIPTION("Mellanox Connect-IB HCA IB driver");
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
index 91e48bce00f0..8316884c258f 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c
@@ -31,7 +31,7 @@
 #include <linux/module.h>
 #include <rdma/ib_umem.h>
 #include <rdma/ib_umem_odp.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 /* @umem: umem object to scan
  * @addr: ib virtual address requested by the user
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
index 0884ba3f4506..6e4122f57f4b 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
@@ -35,7 +35,7 @@
 #include <rdma/ib_umem.h>
 #include <rdma/ib_umem_odp.h>
 #include <rdma/ib_verbs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 enum {
 	MAX_PENDING_REG_MR = 8,
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
index 0ee66192a191..d930d08208c8 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
@@ -32,7 +32,7 @@
 #include <rdma/ib_umem.h>
 #include <rdma/ib_cache.h>
 #include <rdma/ib_user_verbs.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 /* not supported currently */
 static int wq_signature;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
index 3d9165fd71d3..3a70331271dc 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
@@ -35,7 +35,7 @@
 #include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 /* not supported currently */
 static int srq_signature;
diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
index 5bd72e7475fc..d6d15fb2d27e 100644
--- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
+++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c
@@ -30,7 +30,7 @@
 
 #include <linux/module.h>
 #include <dev/mlx5/vport.h>
-#include "mlx5_ib.h"
+#include <dev/mlx5/mlx5_ib/mlx5_ib.h>
 
 int mlx5_ib_get_vf_config(struct ib_device *device, int vf, u8 port,
 			  struct ifla_vf_info *info)