d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qlnxr: remove duplicate defines

Browse Source 
upper_32_bits() and lower_32_bits() are defined twice in this file.
With the extra conditinal removed on LinuxKPI in 3b1ecc9fa1
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
This commit is contained in:
Bjoern A. Zeeb 2021-03-23 14:31:37 +00:00
parent 3b1ecc9fa1
commit 5df6f7a840
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/qlnx/qlnxr/qlnxr_verbs.c
View File

@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
#include "qlnxr_roce.h" #include "qlnxr_roce.h"
#include "qlnxr_cm.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 HILO_U64(hi, lo) ((((u64)(hi)) << 32) + (lo))
#define TYPEPTR_ADDR_SET(type_ptr, field, vaddr) \ #define TYPEPTR_ADDR_SET(type_ptr, field, vaddr) \
@ -1365,9 +1363,6 @@ qlnxr_prepare_pbl_tbl(struct qlnxr_dev *dev,
return 0; return 0;
} }
#define upper_32_bits(x) (uint32_t)(x >> 32)
#define lower_32_bits(x) (uint32_t)(x)
static void static void
qlnxr_populate_pbls(struct qlnxr_dev *dev, struct ib_umem *umem, qlnxr_populate_pbls(struct qlnxr_dev *dev, struct ib_umem *umem,
struct qlnxr_pbl *pbl, struct qlnxr_pbl_info *pbl_info) struct qlnxr_pbl *pbl, struct qlnxr_pbl_info *pbl_info)