From nobody Tue Feb 01 14:46:22 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8252019A5E15; Tue, 1 Feb 2022 14:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jp76Q4fQVz4jDK; Tue, 1 Feb 2022 14:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDIzlOrB445gAhZijkVXT8kxQz27X9P9fFZ3Ct521nk=; b=TorWzJQ3TLKeR7DaKEqlZKXqYQtuOgbFCJvN7MWPYkqzEFh/eBGFdE+LoolvuQsx0BjGe6 wQbt4C6dCypu3YCQ573EfcBtVCCMHgcyrdiRo0TjEPBc9DylSkJB1jgOHZyJ3rBpePxcbR OmZ4R2vcFTQc/ITsm0e4i5NTIs6h4qwBcvVgupKKqYv+E3BxQsMojwrEu4cJxonYVMKT/T ctEnje8DutNhEWUuA8GJ3377C3ffZ+uNiyKrKutK3w900GXejN3XAtrc8IkWbwTwP1jk6K 5pvUQORSvB/qU6u9Brysh3G6Q8vEWRG70Fy6D3eu6OI+PsIozic/6FDGHjSH1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 398C912546; Tue, 1 Feb 2022 14:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 211EkMZ5096788; Tue, 1 Feb 2022 14:46:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211EkMjX096787; Tue, 1 Feb 2022 14:46:22 GMT (envelope-from git) Date: Tue, 1 Feb 2022 14:46:22 GMT Message-Id: <202202011446.211EkMjX096787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 028130b8e466 - main - mlx5ib: idiomatic use of preprocessor, in particular paths List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 028130b8e466e96365efaa898adf4ff2d01a2ea9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643726782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MDIzlOrB445gAhZijkVXT8kxQz27X9P9fFZ3Ct521nk=; b=nLcHCMFCPONh/IIOr+p/RtVcSI/O86BYMVYGWITOjO7IgZh6ULbB9Ox5m9UCjet4mdaBjk uWMHdpSm3fGC+3aCY4f4E8NZUhAEs+54gq7oGPI7TNS610ASWI2Hz7Wz8C/XY3hEcSye62 GVSPYUSxFFo/X/2wsfeHz3iJ/oN+04wIKa/lwkeRKoVXLmrqsbLM3bi/Vif5yeiu+7yCWL WrJevYxlbHSmwKslXmTr3OZPmIb68U4dtGLh74frGMe1SN1FHGH8ge0pP9qm7pc+TQUcui 0cUio8HEFOKPKrUQHTlVHXNS9YVL+0DnXJKeugKfBASGmr2soxDVadxmP9Ch3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643726782; a=rsa-sha256; cv=none; b=aZb4xgXMS6uvfKxsjwGwHKs9tI85ytYBQ2XrE0bQIa7hj5U/lSTG7Hei1T/eCNFuxcgRI9 XVmnvWOhaasb2I1JfdcklSzr7KQJae7A3SMLFMIHnj0H7nAfYrpBHq912zdh68FM+gxm8u prOpaPHWmdl100McU3tmhsTCVaMf1qIvEiTpYlerg80wixycHqU7n/mVR+Fcov5VxiL15W 9Sf76dHt2hWv2I5SbeKNJIBFwbwaJiI34bw1dof3bJINc3nim7/jhZktepL03egP4TgN4u +qSYa7Wl4ilegeCYUegFk1au3BTmTPc8D7KNoK/fo1OgjkfSDFp72FoushJ6ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=028130b8e466e96365efaa898adf4ff2d01a2ea9 commit 028130b8e466e96365efaa898adf4ff2d01a2ea9 Author: Konstantin Belousov AuthorDate: 2021-06-14 11:10:30 +0000 Commit: Konstantin Belousov 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 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 #include 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 #include #include -#include "mlx5_ib.h" +#include 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 #include #include -#include "mlx5_ib.h" +#include #include 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 #include -#include "mlx5_ib.h" +#include 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 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 #include #include -#include "mlx5_ib.h" +#include 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 #include #include -#include "mlx5_ib.h" +#include 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 #include #include -#include "mlx5_ib.h" +#include /* @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 #include #include -#include "mlx5_ib.h" +#include 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 #include #include -#include "mlx5_ib.h" +#include /* 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 #include -#include "mlx5_ib.h" +#include 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 #include -#include "mlx5_ib.h" +#include int mlx5_ib_get_vf_config(struct ib_device *device, int vf, u8 port, struct ifla_vf_info *info)