Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9724a850 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Add parentheses around use of bitfield macro arguments 



Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent 726ba0e1

drivers/net/ethernet/sfc/bitfield.h

+11 −11
Original line number Original line Diff line number Diff line
@@ -120,10 +120,10 @@ typedef union efx_oword { 
 * [0,high-low), with garbage in bits [high-low+1,...).

 * [0,high-low), with garbage in bits [high-low+1,...).

 */

 */

#define EFX_EXTRACT_NATIVE(native_element, min, max, low, high)		\

#define EFX_EXTRACT_NATIVE(native_element, min, max, low, high)		\

	(((low > max) || (high < min)) ? 0 :				\

	((low) > (max) || (high) < (min) ? 0 :				\

	 ((low > min) ?							\

	 (low) > (min) ?						\

	  ((native_element) >> (low - min)) :				\

	 (native_element) >> ((low) - (min)) :				\

	  ((native_element) << (min - low))))

	 (native_element) << ((min) - (low)))





/*

/*

 * Extract bit field portion [low,high) from the 64-bit little-endian

 * Extract bit field portion [low,high) from the 64-bit little-endian
@@ -142,27 +142,27 @@ typedef union efx_oword { 
#define EFX_EXTRACT_OWORD64(oword, low, high)				\

#define EFX_EXTRACT_OWORD64(oword, low, high)				\

	((EFX_EXTRACT64((oword).u64[0], 0, 63, low, high) |		\

	((EFX_EXTRACT64((oword).u64[0], 0, 63, low, high) |		\

	  EFX_EXTRACT64((oword).u64[1], 64, 127, low, high)) &		\

	  EFX_EXTRACT64((oword).u64[1], 64, 127, low, high)) &		\

	 EFX_MASK64(high + 1 - low))

	 EFX_MASK64((high) + 1 - (low)))





#define EFX_EXTRACT_QWORD64(qword, low, high)				\

#define EFX_EXTRACT_QWORD64(qword, low, high)				\

	(EFX_EXTRACT64((qword).u64[0], 0, 63, low, high) &		\

	(EFX_EXTRACT64((qword).u64[0], 0, 63, low, high) &		\

	 EFX_MASK64(high + 1 - low))

	 EFX_MASK64((high) + 1 - (low)))





#define EFX_EXTRACT_OWORD32(oword, low, high)				\

#define EFX_EXTRACT_OWORD32(oword, low, high)				\

	((EFX_EXTRACT32((oword).u32[0], 0, 31, low, high) |		\

	((EFX_EXTRACT32((oword).u32[0], 0, 31, low, high) |		\

	  EFX_EXTRACT32((oword).u32[1], 32, 63, low, high) |		\

	  EFX_EXTRACT32((oword).u32[1], 32, 63, low, high) |		\

	  EFX_EXTRACT32((oword).u32[2], 64, 95, low, high) |		\

	  EFX_EXTRACT32((oword).u32[2], 64, 95, low, high) |		\

	  EFX_EXTRACT32((oword).u32[3], 96, 127, low, high)) &		\

	  EFX_EXTRACT32((oword).u32[3], 96, 127, low, high)) &		\

	 EFX_MASK32(high + 1 - low))

	 EFX_MASK32((high) + 1 - (low)))





#define EFX_EXTRACT_QWORD32(qword, low, high)				\

#define EFX_EXTRACT_QWORD32(qword, low, high)				\

	((EFX_EXTRACT32((qword).u32[0], 0, 31, low, high) |		\

	((EFX_EXTRACT32((qword).u32[0], 0, 31, low, high) |		\

	  EFX_EXTRACT32((qword).u32[1], 32, 63, low, high)) &		\

	  EFX_EXTRACT32((qword).u32[1], 32, 63, low, high)) &		\

	 EFX_MASK32(high + 1 - low))

	 EFX_MASK32((high) + 1 - (low)))





#define EFX_EXTRACT_DWORD(dword, low, high)			\

#define EFX_EXTRACT_DWORD(dword, low, high)			\

	(EFX_EXTRACT32((dword).u32[0], 0, 31, low, high) &	\

	(EFX_EXTRACT32((dword).u32[0], 0, 31, low, high) &	\

	 EFX_MASK32(high + 1 - low))

	 EFX_MASK32((high) + 1 - (low)))





#define EFX_OWORD_FIELD64(oword, field)				\

#define EFX_OWORD_FIELD64(oword, field)				\

	EFX_EXTRACT_OWORD64(oword, EFX_LOW_BIT(field),		\

	EFX_EXTRACT_OWORD64(oword, EFX_LOW_BIT(field),		\
@@ -442,10 +442,10 @@ typedef union efx_oword { 
	cpu_to_le32(EFX_INSERT_NATIVE(min, max, low, high, value))

	cpu_to_le32(EFX_INSERT_NATIVE(min, max, low, high, value))





#define EFX_INPLACE_MASK64(min, max, low, high)				\

#define EFX_INPLACE_MASK64(min, max, low, high)				\

	EFX_INSERT64(min, max, low, high, EFX_MASK64(high + 1 - low))

	EFX_INSERT64(min, max, low, high, EFX_MASK64((high) + 1 - (low)))





#define EFX_INPLACE_MASK32(min, max, low, high)				\

#define EFX_INPLACE_MASK32(min, max, low, high)				\

	EFX_INSERT32(min, max, low, high, EFX_MASK32(high + 1 - low))

	EFX_INSERT32(min, max, low, high, EFX_MASK32((high) + 1 - (low)))





#define EFX_SET_OWORD64(oword, low, high, value) do {			\

#define EFX_SET_OWORD64(oword, low, high, value) do {			\

	(oword).u64[0] = (((oword).u64[0]				\

	(oword).u64[0] = (((oword).u64[0]				\