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/boards/bigsur/io.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff -puN arch/sh/boards/bigsur/io.c~min-max-arch_sh_boards_bigsur_io arch/sh/boards/bigsur/io.c
--- linux-2.6.10-rc2-bk4/arch/sh/boards/bigsur/io.c~min-max-arch_sh_boards_bigsur_io 2004-11-19 17:15:21.000000000 +0100
+++ linux-2.6.10-rc2-bk4-max/arch/sh/boards/bigsur/io.c 2004-11-19 17:15:21.000000000 +0100
@@ -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(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 +76,7 @@ void bigsur_port_unmap(u32 baseport, u32
bigsur_iomap_lo[port>>BIGSUR_IOMAP_LO_SHIFT] = 0;
}
- for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ;
+ for (port = max(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;
_