Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9724a8504c875145f5a513bb8eca50671cee23b4

Authored by Ben Hutchings
1 parent 726ba0e14a
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

sfc: Add parentheses around use of bitfield macro arguments 

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

drivers/net/ethernet/sfc/bitfield.h
Diff comments   View file @ 9724a85
... ... @@ -120,10 +120,10 @@
120 120 * [0,high-low), with garbage in bits [high-low+1,...).
121 121 */
122 122 #define EFX_EXTRACT_NATIVE(native_element, min, max, low, high) \
123   - (((low > max) || (high < min)) ? 0 : \
124   - ((low > min) ? \
125   - ((native_element) >> (low - min)) : \
126   - ((native_element) << (min - low))))
  123 + ((low) > (max) || (high) < (min) ? 0 : \
  124 + (low) > (min) ? \
  125 + (native_element) >> ((low) - (min)) : \
  126 + (native_element) << ((min) - (low)))
127 127  
128 128 /*
129 129 * Extract bit field portion [low,high) from the 64-bit little-endian
130 130  
131 131  
132 132  
133 133  
... ... @@ -142,27 +142,27 @@
142 142 #define EFX_EXTRACT_OWORD64(oword, low, high) \
143 143 ((EFX_EXTRACT64((oword).u64[0], 0, 63, low, high) | \
144 144 EFX_EXTRACT64((oword).u64[1], 64, 127, low, high)) & \
145   - EFX_MASK64(high + 1 - low))
  145 + EFX_MASK64((high) + 1 - (low)))
146 146  
147 147 #define EFX_EXTRACT_QWORD64(qword, low, high) \
148 148 (EFX_EXTRACT64((qword).u64[0], 0, 63, low, high) & \
149   - EFX_MASK64(high + 1 - low))
  149 + EFX_MASK64((high) + 1 - (low)))
150 150  
151 151 #define EFX_EXTRACT_OWORD32(oword, low, high) \
152 152 ((EFX_EXTRACT32((oword).u32[0], 0, 31, low, high) | \
153 153 EFX_EXTRACT32((oword).u32[1], 32, 63, low, high) | \
154 154 EFX_EXTRACT32((oword).u32[2], 64, 95, low, high) | \
155 155 EFX_EXTRACT32((oword).u32[3], 96, 127, low, high)) & \
156   - EFX_MASK32(high + 1 - low))
  156 + EFX_MASK32((high) + 1 - (low)))
157 157  
158 158 #define EFX_EXTRACT_QWORD32(qword, low, high) \
159 159 ((EFX_EXTRACT32((qword).u32[0], 0, 31, low, high) | \
160 160 EFX_EXTRACT32((qword).u32[1], 32, 63, low, high)) & \
161   - EFX_MASK32(high + 1 - low))
  161 + EFX_MASK32((high) + 1 - (low)))
162 162  
163 163 #define EFX_EXTRACT_DWORD(dword, low, high) \
164 164 (EFX_EXTRACT32((dword).u32[0], 0, 31, low, high) & \
165   - EFX_MASK32(high + 1 - low))
  165 + EFX_MASK32((high) + 1 - (low)))
166 166  
167 167 #define EFX_OWORD_FIELD64(oword, field) \
168 168 EFX_EXTRACT_OWORD64(oword, EFX_LOW_BIT(field), \
169 169  
... ... @@ -442,10 +442,10 @@
442 442 cpu_to_le32(EFX_INSERT_NATIVE(min, max, low, high, value))
443 443  
444 444 #define EFX_INPLACE_MASK64(min, max, low, high) \
445   - EFX_INSERT64(min, max, low, high, EFX_MASK64(high + 1 - low))
  445 + EFX_INSERT64(min, max, low, high, EFX_MASK64((high) + 1 - (low)))
446 446  
447 447 #define EFX_INPLACE_MASK32(min, max, low, high) \
448   - EFX_INSERT32(min, max, low, high, EFX_MASK32(high + 1 - low))
  448 + EFX_INSERT32(min, max, low, high, EFX_MASK32((high) + 1 - (low)))
449 449  
450 450 #define EFX_SET_OWORD64(oword, low, high, value) do { \
451 451 (oword).u64[0] = (((oword).u64[0] \