From cd88b76a4cb00f3dbe918b9310ed82acc08cd473 Mon Sep 17 00:00:00 2001 From: Michael Veeck Date: Sat, 10 Sep 2005 00:27:13 -0700 Subject: [PATCH] --- yaml --- r: 8398 b: refs/heads/master c: 31a34571e5eed7cb1d70d5e7edd013261fe602e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/cchips/hd6446x/hd64465/io.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 0b2eae937a3c..87503981dfb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e8bbf59bd1ff78ad7e6c7afe6acef91372914e1 +refs/heads/master: 31a34571e5eed7cb1d70d5e7edd013261fe602e9 diff --git a/trunk/arch/sh/cchips/hd6446x/hd64465/io.c b/trunk/arch/sh/cchips/hd6446x/hd64465/io.c index 99ac709c550e..84cb142def0b 100644 --- a/trunk/arch/sh/cchips/hd6446x/hd64465/io.c +++ b/trunk/arch/sh/cchips/hd6446x/hd64465/io.c @@ -48,10 +48,6 @@ static unsigned char hd64465_iomap_lo_shift[HD64465_IOMAP_LO_NMAP]; 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 baseport, unsigned int nports, 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;