Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[pandora-kernel.git] / arch / sh / boards / bigsur / io.c

diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c
index 697144d..23071f9 100644 (file)
--- a/arch/sh/boards/bigsur/io.c
+++ b/arch/sh/boards/bigsur/io.c
@@ -1,5 +1,5 @@
 /*
- * include/asm-sh/io_bigsur.c
+ * arch/sh/boards/bigsur/io.c
  *
  * By Dustin McIntire (dustin@sensoria.com) (c)2001
  * Derived from io_hd64465.h, which bore the message:
@@ -14,7 +14,6 @@
  * IO functions for a Hitachi Big Sur Evaluation Board.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/machvec.h>
@@ -37,10 +36,6 @@ static u8 bigsur_iomap_lo_shift[BIGSUR_IOMAP_LO_NMAP];
 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 +52,7 @@ void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
                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_HI_SHIFT)) {
                pr_debug("    maphi[0x%x] = 0x%08x\n", port, addr);
@@ -80,7 +75,7 @@ void bigsur_port_unmap(u32 baseport, u32 nports)
                bigsur_iomap_lo[port>>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)) {
                bigsur_iomap_hi[port>>BIGSUR_IOMAP_HI_SHIFT] = 0;