Date: Tue, 1 Feb 2022 14:46:22 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 028130b8e466 - main - mlx5ib: idiomatic use of preprocessor, in particular paths Message-ID: <202202011446.211EkMjX096787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=028130b8e466e96365efaa898adf4ff2d01a2ea9 commit 028130b8e466e96365efaa898adf4ff2d01a2ea9 Author: Konstantin Belousov <konstantinb@nvidia.com> AuthorDate: 2021-06-14 11:10:30 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-02-01 12:45:58 +0000 mlx5ib: idiomatic use of preprocessor, in particular paths MFC after: 1 week Sponsored by: NVIDIA Networking --- 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_devx.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 +- 13 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c index 8e142316264e..e98c6a6b7787 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 void 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 fd3755fd48a7..d75e724c9744 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c @@ -33,7 +33,7 @@ #include <rdma/ib_user_verbs.h> #include <rdma/ib_cache.h> #include <rdma/uverbs_ioctl.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_devx.c b/sys/dev/mlx5/mlx5_ib/mlx5_ib_devx.c index bfb44e8ffb34..e8c982978998 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_devx.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_devx.c @@ -38,7 +38,7 @@ #include <rdma/uverbs_std_types.h> #include <dev/mlx5/driver.h> #include <dev/mlx5/fs.h> -#include "mlx5_ib.h" +#include <dev/mlx5/mlx5_ib/mlx5_ib.h> #include <sys/priv.h> 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 59e1590e0b30..17828ccddc9e 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 21944536fc6c..598a506b3b70 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c @@ -52,7 +52,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 e89e0197fb30..d89050c57e10 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 9a2a3430461f..8377ba388e6d 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c @@ -33,7 +33,7 @@ #include <rdma/ib_cache.h> #include <rdma/ib_user_verbs.h> #include <rdma/uverbs_ioctl.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 8e8e263bb5a5..6c092f0447f4 100644 --- a/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c +++ b/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c @@ -36,7 +36,7 @@ #include <rdma/ib_user_verbs.h> #include <rdma/uverbs_ioctl.h> -#include "mlx5_ib.h" +#include <dev/mlx5/mlx5_ib/mlx5_ib.h> static void *get_wqe(struct mlx5_ib_srq *srq, int n) { 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202011446.211EkMjX096787>