Commit c3939872 authored by David Laight's avatar David Laight Committed by Andrew Morton
Browse files

minmax.h: move all the clamp() definitions after the min/max() ones 

At some point the definitions for clamp() got added in the middle of the
ones for min() and max().  Re-order the definitions so they are more
sensibly grouped.

Link: https://lkml.kernel.org/r/8bb285818e4846469121c8abc3dfb6e2@AcuMS.aculab.com


Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Pedro Falcato <pedro.falcato@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent a5743f32

include/linux/minmax.h

+51 −58
Original line number Diff line number Diff line
@@ -99,22 +99,6 @@ 
#define __careful_cmp(op, x, y) \

	__careful_cmp_once(op, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))



#define __clamp(val, lo, hi)	\

	((val) >= (hi) ? (hi) : ((val) <= (lo) ? (lo) : (val)))



#define __clamp_once(val, lo, hi, uval, ulo, uhi) ({				\

	__auto_type uval = (val);						\

	__auto_type ulo = (lo);							\

	__auto_type uhi = (hi);							\

	BUILD_BUG_ON_MSG(statically_true(ulo > uhi),				\

		"clamp() low limit " #lo " greater than high limit " #hi);	\

	BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi),				\

		"clamp("#val", "#lo", "#hi") signedness error");		\

	__clamp(uval, ulo, uhi); })



#define __careful_clamp(val, lo, hi) \

	__clamp_once(val, lo, hi, __UNIQUE_ID(v_), __UNIQUE_ID(l_), __UNIQUE_ID(h_))



/**

 * min - return minimum of two values of the same or compatible types

 * @x: first value
@@ -170,6 +154,22 @@ 
#define max3(x, y, z) \

	__careful_op3(max, x, y, z, __UNIQUE_ID(x_), __UNIQUE_ID(y_), __UNIQUE_ID(z_))



/**

 * min_t - return minimum of two values, using the specified type

 * @type: data type to use

 * @x: first value

 * @y: second value

 */

#define min_t(type, x, y) __cmp_once(min, type, x, y)



/**

 * max_t - return maximum of two values, using the specified type

 * @type: data type to use

 * @x: first value

 * @y: second value

 */

#define max_t(type, x, y) __cmp_once(max, type, x, y)



/**

 * min_not_zero - return the minimum that is _not_ zero, unless both are zero

 * @x: value1
@@ -180,6 +180,22 @@ 
	typeof(y) __y = (y);			\

	__x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); })



#define __clamp(val, lo, hi)	\

	((val) >= (hi) ? (hi) : ((val) <= (lo) ? (lo) : (val)))



#define __clamp_once(val, lo, hi, uval, ulo, uhi) ({				\

	__auto_type uval = (val);						\

	__auto_type ulo = (lo);							\

	__auto_type uhi = (hi);							\

	BUILD_BUG_ON_MSG(statically_true(ulo > uhi),				\

		"clamp() low limit " #lo " greater than high limit " #hi);	\

	BUILD_BUG_ON_MSG(!__types_ok3(uval, ulo, uhi),				\

		"clamp("#val", "#lo", "#hi") signedness error");		\

	__clamp(uval, ulo, uhi); })



#define __careful_clamp(val, lo, hi) \

	__clamp_once(val, lo, hi, __UNIQUE_ID(v_), __UNIQUE_ID(l_), __UNIQUE_ID(h_))



/**

 * clamp - return a value clamped to a given range with strict typechecking

 * @val: current value
@@ -191,28 +207,30 @@ 
 */

#define clamp(val, lo, hi) __careful_clamp(val, lo, hi)



/*

 * ..and if you can't take the strict

 * types, you can specify one yourself.

 *

 * Or not use min/max/clamp at all, of course.

 */



/**

 * min_t - return minimum of two values, using the specified type

 * @type: data type to use

 * @x: first value

 * @y: second value

 * clamp_t - return a value clamped to a given range using a given type

 * @type: the type of variable to use

 * @val: current value

 * @lo: minimum allowable value

 * @hi: maximum allowable value

 *

 * This macro does no typechecking and uses temporary variables of type

 * @type to make all the comparisons.

 */

#define min_t(type, x, y) __cmp_once(min, type, x, y)

#define clamp_t(type, val, lo, hi) __careful_clamp((type)(val), (type)(lo), (type)(hi))



/**

 * max_t - return maximum of two values, using the specified type

 * @type: data type to use

 * @x: first value

 * @y: second value

 * clamp_val - return a value clamped to a given range using val's type

 * @val: current value

 * @lo: minimum allowable value

 * @hi: maximum allowable value

 *

 * 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 and @lo and @hi are literals that will otherwise be assigned a signed

 * integer type.

 */

#define max_t(type, x, y) __cmp_once(max, type, x, y)

#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)



/*

 * Do not check the array parameter using __must_be_array().
@@ -257,31 +275,6 @@ 
 */

#define max_array(array, len) __minmax_array(max, array, len)



/**

 * clamp_t - return a value clamped to a given range using a given type

 * @type: the type of variable to use

 * @val: current value

 * @lo: minimum allowable value

 * @hi: maximum allowable value

 *

 * This macro does no typechecking and uses temporary variables of type

 * @type to make all the comparisons.

 */

#define clamp_t(type, val, lo, hi) __careful_clamp((type)(val), (type)(lo), (type)(hi))



/**

 * clamp_val - return a value clamped to a given range using val's type

 * @val: current value

 * @lo: minimum allowable value

 * @hi: maximum allowable value

 *

 * 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 and @lo and @hi are literals that will otherwise be assigned a signed

 * integer type.

 */

#define clamp_val(val, lo, hi) clamp_t(typeof(val), val, lo, hi)



static inline bool in_range64(u64 val, u64 start, u64 len)

{

	return (val - start) < len;