minmax-removal arch/sh/cchips/hd6446x/hd64465/io.c

PATCH New [email protected] 1 participant 1 message Nov 20, 2004 SuperH

lore

Share & tools

lore

[email protected]

author

2004-11-20 04:22 UTC #0 lore raw

PATCH 4/4 minmax-removal arch/sh/cchips/hd6446x/hd64465/io.c

Patch (against 2.6.8.1) removes unnecessary min/max macros and changes calls to use kernel.h macros instead.

Since I dont have the hardware those patches are not tested.

Best regards
Veeck

Signed-off-by Michael Veeck <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.10-rc2-bk4-max/arch/sh/cchips/hd6446x/hd64465/io.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

arch/sh/cchips/hd6446x/hd64465/io.c renamed from arch/sh/cchips/hd6446x/hd64465/io.c~min-max-arch_sh_cchips_hd6446x_hd64465_io +2 -6

diff -puN arch/sh/cchips/hd6446x/hd64465/io.c~min-max-arch_sh_cchips_hd6446x_hd64465_io arch/sh/cchips/hd6446x/hd64465/io.c
@@ -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_HI_SHIFT)) {
 	    DPRINTK("    maphi[0x%x] = 0x%08lx\n", port, addr);

@@ -95,7 +91,7 @@ void hd64465_port_unmap(unsigned short b
     	    hd64465_iomap_lo[port>>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)) {
     	    hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0;