Commit c185b07f authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Linus Torvalds

include/linux/kernel.h: deduplicate code implementing clamp* macros

Instead of open-coding clamp_t macro min_t and max_t the way clamp macro
does and instead of open-coding clamp_val simply use clamp_t.
Furthermore, normalise argument naming in the macros to be lo and hi.
Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Cc: Mark Rustad <mark.d.rustad@intel.com>
Cc: "Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>
Cc: Hagen Paul Pfeifer <hagen@jauu.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2e1d06e1
...@@ -734,7 +734,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } ...@@ -734,7 +734,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
* @lo: lowest allowable value * @lo: lowest allowable value
* @hi: highest allowable value * @hi: highest allowable value
* *
* This macro does strict typechecking of min/max to make sure they are of the * This macro does strict typechecking of lo/hi to make sure they are of the
* same type as val. See the unnecessary pointer comparisons. * same type as val. See the unnecessary pointer comparisons.
*/ */
#define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi) #define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi)
...@@ -759,36 +759,26 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } ...@@ -759,36 +759,26 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
* clamp_t - return a value clamped to a given range using a given type * clamp_t - return a value clamped to a given range using a given type
* @type: the type of variable to use * @type: the type of variable to use
* @val: current value * @val: current value
* @min: minimum allowable value * @lo: minimum allowable value
* @max: maximum allowable value * @hi: maximum allowable value
* *
* This macro does no typechecking and uses temporary variables of type * This macro does no typechecking and uses temporary variables of type
* 'type' to make all the comparisons. * 'type' to make all the comparisons.
*/ */
#define clamp_t(type, val, min, max) ({ \ #define clamp_t(type, val, lo, hi) min_t(type, max_t(type, val, lo), hi)
type __val = (val); \
type __min = (min); \
type __max = (max); \
__val = __val < __min ? __min: __val; \
__val > __max ? __max: __val; })
/** /**
* clamp_val - return a value clamped to a given range using val's type * clamp_val - return a value clamped to a given range using val's type
* @val: current value * @val: current value
* @min: minimum allowable value * @lo: minimum allowable value
* @max: maximum allowable value * @hi: maximum allowable value
* *
* This macro does no typechecking and uses temporary variables of whatever * This macro does no typechecking and uses temporary variables of whatever
* type the input argument 'val' is. This is useful when val is an unsigned * type the input argument 'val' is. This is useful when val is an unsigned
* type and min and max are literals that will otherwise be assigned a signed * type and min and max are literals that will otherwise be assigned a signed
* integer type. * integer type.
*/ */
#define clamp_val(val, min, max) ({ \ #define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)
typeof(val) __val = (val); \
typeof(val) __min = (min); \
typeof(val) __max = (max); \
__val = __val < __min ? __min: __val; \
__val > __max ? __max: __val; })
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment