Skip to content

Commit f4b84b2

Browse files
david-laightakpm00
authored andcommitted
minmax: fix indentation of __cmp_once() and __clamp_once()
Remove the extra indentation and align continuation markers. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: David Laight <[email protected]> Cc: Andy Shevchenko <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Jason A. Donenfeld <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent d03eba9 commit f4b84b2

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

include/linux/minmax.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#define __cmp(op, x, y) ((x) __cmp_op_##op (y) ? (x) : (y))
3636

3737
#define __cmp_once(op, x, y, unique_x, unique_y) ({ \
38-
typeof(x) unique_x = (x); \
39-
typeof(y) unique_y = (y); \
40-
static_assert(__types_ok(x, y), \
41-
#op "(" #x ", " #y ") signedness error, fix types or consider u" #op "() before " #op "_t()"); \
42-
__cmp(op, unique_x, unique_y); })
38+
typeof(x) unique_x = (x); \
39+
typeof(y) unique_y = (y); \
40+
static_assert(__types_ok(x, y), \
41+
#op "(" #x ", " #y ") signedness error, fix types or consider u" #op "() before " #op "_t()"); \
42+
__cmp(op, unique_x, unique_y); })
4343

4444
#define __careful_cmp(op, x, y) \
4545
__builtin_choose_expr(__is_constexpr((x) - (y)), \
@@ -49,16 +49,16 @@
4949
#define __clamp(val, lo, hi) \
5050
((val) >= (hi) ? (hi) : ((val) <= (lo) ? (lo) : (val)))
5151

52-
#define __clamp_once(val, lo, hi, unique_val, unique_lo, unique_hi) ({ \
53-
typeof(val) unique_val = (val); \
54-
typeof(lo) unique_lo = (lo); \
55-
typeof(hi) unique_hi = (hi); \
56-
static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)), \
57-
(lo) <= (hi), true), \
58-
"clamp() low limit " #lo " greater than high limit " #hi); \
59-
static_assert(__types_ok(val, lo), "clamp() 'lo' signedness error"); \
60-
static_assert(__types_ok(val, hi), "clamp() 'hi' signedness error"); \
61-
__clamp(unique_val, unique_lo, unique_hi); })
52+
#define __clamp_once(val, lo, hi, unique_val, unique_lo, unique_hi) ({ \
53+
typeof(val) unique_val = (val); \
54+
typeof(lo) unique_lo = (lo); \
55+
typeof(hi) unique_hi = (hi); \
56+
static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)), \
57+
(lo) <= (hi), true), \
58+
"clamp() low limit " #lo " greater than high limit " #hi); \
59+
static_assert(__types_ok(val, lo), "clamp() 'lo' signedness error"); \
60+
static_assert(__types_ok(val, hi), "clamp() 'hi' signedness error"); \
61+
__clamp(unique_val, unique_lo, unique_hi); })
6262

6363
#define __careful_clamp(val, lo, hi) ({ \
6464
__builtin_choose_expr(__is_constexpr((val) - (lo) + (hi)), \

0 commit comments

Comments
 (0)