From: Michael Veeck Patch removes unnecessary min/max macros and changes calls to use kernel.h macros instead. Signed-off-by: Michael Veeck Signed-off-by: Maximilian Attems Signed-off-by: Domen Puncer Cc: Paul Mundt Signed-off-by: Andrew Morton --- arch/sh/boards/bigsur/io.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff -puN arch/sh/boards/bigsur/io.c~janitor-sh-bigsur-io-minmax-removal arch/sh/boards/bigsur/io.c --- devel/arch/sh/boards/bigsur/io.c~janitor-sh-bigsur-io-minmax-removal 2005-08-08 23:16:27.000000000 -0700 +++ devel-akpm/arch/sh/boards/bigsur/io.c 2005-08-08 23:16:27.000000000 -0700 @@ -37,10 +37,6 @@ static u8 bigsur_iomap_lo_shift[BIGSUR_I static u32 bigsur_iomap_hi[BIGSUR_IOMAP_HI_NMAP]; static u8 bigsur_iomap_hi_shift[BIGSUR_IOMAP_HI_NMAP]; -#ifndef MAX -#define MAX(a,b) ((a)>(b)?(a):(b)) -#endif - void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift) { u32 port, endport = baseport + nports; @@ -57,7 +53,7 @@ void bigsur_port_map(u32 baseport, u32 n addr += (1<<(BIGSUR_IOMAP_LO_SHIFT)); } - for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ; + for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH); port < endport && port < BIGSUR_IOMAP_HI_THRESH ; port += (1<>BIGSUR_IOMAP_LO_SHIFT] = 0; } - for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ; + for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH); port < endport && port < BIGSUR_IOMAP_HI_THRESH ; port += (1<>BIGSUR_IOMAP_HI_SHIFT] = 0; _