git: 5df6f7a84058 - main - qlnxr: remove duplicate defines

[Bjoern A. Zeeb]

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=5df6f7a8405899fac795f227de96ebadd10d60af

commit 5df6f7a8405899fac795f227de96ebadd10d60af
Author:     Bjoern A. Zeeb <bz at FreeBSD.org>
AuthorDate: 2021-03-23 14:31:37 +0000
Commit:     Bjoern A. Zeeb <bz at FreeBSD.org>
CommitDate: 2021-03-24 23:03:30 +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
    MFC-after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D29392
---
 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)