From: Jeremiah Mahler Date: Fri, 26 Dec 2014 00:04:43 +0000 (-0800) Subject: staging: lustre: replace MIN/MAX with min_t/max_t X-Git-Tag: v4.0-rc1~82^2~317 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=387915ded529bc47138d1b1401c94569ac4ce71c;p=karo-tx-linux.git staging: lustre: replace MIN/MAX with min_t/max_t Switch from MIN/MAX to min_t/max_t with a size_t type. The size_t type was chosen because one operand is a size_t and all the others are immediate integer values. Signed-off-by: Jeremiah Mahler Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 46cde7036f1d..c055afc86eb4 100644 --- a/drivers/staging/lustre/lnet/lnet/router_proc.c +++ b/drivers/staging/lustre/lnet/lnet/router_proc.c @@ -49,7 +49,7 @@ enum { */ #define LNET_PROC_CPT_BITS (LNET_CPT_BITS + 1) /* change version, 16 bits or 8 bits */ -#define LNET_PROC_VER_BITS MAX(((MIN(LNET_LOFFT_BITS, 64)) / 4), 8) +#define LNET_PROC_VER_BITS max_t(size_t, min_t(size_t, LNET_LOFFT_BITS, 64) / 4, 8) #define LNET_PROC_HASH_BITS LNET_PEER_HASH_BITS /*