Unverified Commit 5ce3218d authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Nathan Chancellor
Browse files

overflow: Remove is_non_negative() and is_negative() 



The is_non_negative() and is_negative() function-like macros just
exist as a workaround to silence the -Wtype-limits warning. Now that
this warning is disabled, those two macros have lost their raison
d'être. Remove them.

This reverts commit dc7fe518 ("overflow: Fix -Wtype-limits
compilation warnings").

Suggested-by: default avatarNicolas Schier <nsc@kernel.org>
Link: https://lore.kernel.org/all/aUT_yWin_xslnOFh@derry.ads.avm.de


Signed-off-by: default avatarVincent Mailhol <mailhol@kernel.org>
Reviewed-by: default avatarNicolas Schier <nsc@kernel.org>
Link: https://patch.msgid.link/20251220-remove_wtype-limits-v3-3-24b170af700e@kernel.org


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
parent 34a1bd0b

include/linux/overflow.h

+2 −8
Original line number Diff line number Diff line
@@ -36,12 +36,6 @@ 
#define __type_min(T) ((T)((T)-type_max(T)-(T)1))

#define type_min(t)	__type_min(typeof(t))



/*

 * Avoids triggering -Wtype-limits compilation warning,

 * while using unsigned data types to check a < 0.

 */

#define is_non_negative(a) ((a) > 0 || (a) == 0)

#define is_negative(a) (!(is_non_negative(a)))



/*

 * Allows for effectively applying __must_check to a macro so we can have
@@ -201,9 +195,9 @@ static inline bool __must_check __must_check_overflow(bool overflow) 
	typeof(d) _d = d;						\

	unsigned long long _a_full = _a;				\

	unsigned int _to_shift =					\

		is_non_negative(_s) && _s < 8 * sizeof(*d) ? _s : 0;	\

		_s >= 0 && _s < 8 * sizeof(*d) ? _s : 0;		\

	*_d = (_a_full << _to_shift);					\

	(_to_shift != _s || is_negative(*_d) || is_negative(_a) ||	\

	(_to_shift != _s || *_d < 0 || _a < 0 ||			\

	(*_d >> _to_shift) != _a);					\

}))