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 Signed-off-by: Andrew Morton --- arch/sh/cchips/hd6446x/hd64465/io.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff -puN arch/sh/cchips/hd6446x/hd64465/io.c~janitor-sh-hd64465-minmax-removal arch/sh/cchips/hd6446x/hd64465/io.c --- devel/arch/sh/cchips/hd6446x/hd64465/io.c~janitor-sh-hd64465-minmax-removal 2005-08-08 23:16:37.000000000 -0700 +++ devel-akpm/arch/sh/cchips/hd6446x/hd64465/io.c 2005-08-08 23:16:37.000000000 -0700 @@ -48,10 +48,6 @@ static unsigned char hd64465_iomap_lo_sh static unsigned long hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP]; static unsigned char hd64465_iomap_hi_shift[HD64465_IOMAP_HI_NMAP]; -#ifndef MAX -#define MAX(a,b) ((a)>(b)?(a):(b)) -#endif - #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x)) void hd64465_port_map(unsigned short baseport, unsigned int nports, @@ -71,7 +67,7 @@ void hd64465_port_map(unsigned short bas addr += (1<<(HD64465_IOMAP_LO_SHIFT)); } - for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ; + for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH); port < endport && port < HD64465_IOMAP_HI_THRESH ; port += (1<>HD64465_IOMAP_LO_SHIFT] = 0; } - for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ; + for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH); port < endport && port < HD64465_IOMAP_HI_THRESH ; port += (1<>HD64465_IOMAP_HI_SHIFT] = 0; _