From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 00:36:00 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E91A965F09D; Sun, 18 Jul 2021 00:36:00 +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 4GS5cc2vjCz4R53; Sun, 18 Jul 2021 00:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B866E1A3C1; Sun, 18 Jul 2021 00:35:59 +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 16I0ZxV2048531; Sun, 18 Jul 2021 00:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0Zx47048530; Sun, 18 Jul 2021 00:35:59 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:35:59 GMT Message-Id: <202107180035.16I0Zx47048530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f81b4f3be750 - stable/13 - qlnxr: remove duplicate defines MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f81b4f3be750012f5ede7c4d0b71b3f457eb8e7d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 00:36:02 -0000 The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f81b4f3be750012f5ede7c4d0b71b3f457eb8e7d commit f81b4f3be750012f5ede7c4d0b71b3f457eb8e7d Author: Bjoern A. Zeeb AuthorDate: 2021-03-23 14:31:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-07-18 00:34:58 +0000 qlnxr: remove duplicate defines upper_32_bits() and lower_32_bits() are defined twice in this file. With the extra conditinal removed on LinuxKPI in 3b1ecc9fa1b5 they are also included from there already. Use the LinuxKPI version and remove the two local ones. Sponsored by: The FreeBSD Foundation Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D29392 (cherry picked from commit 5df6f7a8405899fac795f227de96ebadd10d60af) --- sys/dev/qlnx/qlnxr/qlnxr_verbs.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/qlnx/qlnxr/qlnxr_verbs.c b/sys/dev/qlnx/qlnxr/qlnxr_verbs.c index 35b46e11a3b9..9c0087c1b76d 100644 --- a/sys/dev/qlnx/qlnxr/qlnxr_verbs.c +++ b/sys/dev/qlnx/qlnxr/qlnxr_verbs.c @@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$"); #include "qlnxr_roce.h" #include "qlnxr_cm.h" -#define upper_32_bits(x) (uint32_t)(x >> 32) -#define lower_32_bits(x) (uint32_t)(x) #define HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo)) #define TYPEPTR_ADDR_SET(type_ptr, field, vaddr) \ @@ -1365,9 +1363,6 @@ qlnxr_prepare_pbl_tbl(struct qlnxr_dev *dev, return 0; } -#define upper_32_bits(x) (uint32_t)(x >> 32) -#define lower_32_bits(x) (uint32_t)(x) - static void qlnxr_populate_pbls(struct qlnxr_dev *dev, struct ib_umem *umem, struct qlnxr_pbl *pbl, struct qlnxr_pbl_info *pbl_info)