Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758411AbYCKVNA (ORCPT ); Tue, 11 Mar 2008 17:13:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757987AbYCKVL7 (ORCPT ); Tue, 11 Mar 2008 17:11:59 -0400 Received: from el-out-1112.google.com ([209.85.162.181]:35585 "EHLO el-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757974AbYCKVL6 (ORCPT ); Tue, 11 Mar 2008 17:11:58 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=T0ewAho7Jnrvs41qzJ2RtA9pyNADmuwNSr4yyc0xImYVt5M60HqbtatQ04+b5ZyaJ9buT0Xf1aIclD+Ril2ObwIWKzg7DF7s4YfNqFxFT8XMUsCea3nJpswLRwBe5pR3hVDlzewhsssfbTLaLTKjeBif685eSLWaiaCe/0zFwKE= Subject: [PATCH 1/6] kernel: add clamp(), clamp_t() and clamp_val() macros From: Harvey Harrison To: Andrew Morton Cc: LKML , Michael Buesch , Alan Cox , Jeff Garzik , Bartlomiej Zolnierkiewicz , Mauro Carvalho Chehab Content-Type: text/plain Date: Tue, 11 Mar 2008 14:11:34 -0700 Message-Id: <1205269894.22317.32.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3583 Lines: 120 Adds macros similar to min/max/min_t/max_t. Also, change the variable names used in the min/max macros to avoid shadowed variable warnings when min/max min_t/max_t are nested. clamp_val is useful when clamping to constants so all types are taken from typeof() the first arg. Small formatting changes to make all the macros have a similar form. Signed-off-by: Harvey Harrison --- Andrew, this is a rollup of my original patch already in -mm with checkpatch warnings fixed up and one additional macro based on limit_value found in the b43 driver, called clamp_val. clamp_t is no longer used, but I introduce it anyway as some future user may want to force the return type similar to how min_t/max_t operate. include/linux/kernel.h | 66 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 48 insertions(+), 18 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 2df44e7..b9331ac 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -335,33 +335,63 @@ static inline int __attribute__ ((format (printf, 1, 2))) pr_debug(const char * #endif /* __LITTLE_ENDIAN */ /* - * min()/max() macros that also do + * min()/max()/clamp() macros that also do * strict type-checking.. See the * "unnecessary" pointer comparison. */ -#define min(x,y) ({ \ - typeof(x) _x = (x); \ - typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x < _y ? _x : _y; }) - -#define max(x,y) ({ \ - typeof(x) _x = (x); \ - typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x > _y ? _x : _y; }) +#define min(x, y) ({ \ + typeof(x) _min1 = (x); \ + typeof(y) _min2 = (y); \ + (void) (&_min1 == &_min2); \ + _min1 < _min2 ? _min1 : _min2; }) + +#define max(x, y) ({ \ + typeof(x) _max1 = (x); \ + typeof(y) _max2 = (y); \ + (void) (&_max1 == &_max2); \ + _max1 > _max2 ? _max1 : _max2; }) + +#define clamp(val, min, max) ({ \ + typeof(val) __val = (val); \ + typeof(min) __min = (min); \ + typeof(max) __max = (max); \ + (void) (&__val == &__min); \ + (void) (&__val == &__max); \ + __val = __val < __min ? __min: __val; \ + __val > __max ? __max: __val; }) + +/* + * Useful when min and max are constants. + */ +#define clamp_val(val, min, max) ({ \ + typeof(val) __val = (val); \ + typeof(val) __min = (min); \ + typeof(val) __max = (max); \ + __val = __val < __min ? __min: __val; \ + __val > __max ? __max: __val; }) /* * ..and if you can't take the strict * types, you can specify one yourself. * - * Or not use min/max at all, of course. + * Or not use min/max/clamp at all, of course. */ -#define min_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) -#define max_t(type,x,y) \ - ({ type __x = (x); type __y = (y); __x > __y ? __x: __y; }) - +#define min_t(type, x, y) ({ \ + type __min1 = (x); \ + type __min2 = (y); \ + __min1 < __min2 ? __min1: __min2; }) + +#define max_t(type, x, y) ({ \ + type __max1 = (x); \ + type __max2 = (y); \ + __max1 > __max2 ? __max1: __max2; }) + +#define clamp_t(type, val, min, max) ({ \ + type __val = (val); \ + type __min = (min); \ + type __max = (max); \ + __val = __val < __min ? __min: __val; \ + __val > __max ? __max: __val; }) /** * container_of - cast a member of a structure out to the containing structure -- 1.5.4.4.592.g32d4c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/