diff options
| author | Michael Veeck <michael.veeck@gmx.net> | 2005-09-10 09:27:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 19:06:33 +0200 |
| commit | 0e8bbf59bd1ff78ad7e6c7afe6acef91372914e1 (patch) | |
| tree | d2a6de17c6d843bfe9128e53c34a45109bf7ed63 | |
| parent | [PATCH] janitor: tulip/de4x5: list_for_each (diff) | |
| download | linux-0e8bbf59bd1ff78ad7e6c7afe6acef91372914e1.tar.xz linux-0e8bbf59bd1ff78ad7e6c7afe6acef91372914e1.zip | |
[PATCH] janitor: sh: bigsur/io: minmax-removal
Patch removes unnecessary min/max macros and changes calls to use kernel.h
macros instead.
Signed-off-by: Michael Veeck <michael.veeck@gmx.net>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/sh/boards/bigsur/io.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c index 697144de7419..a9fde781b21a 100644 --- a/arch/sh/boards/bigsur/io.c +++ b/arch/sh/boards/bigsur/io.c @@ -37,10 +37,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 +53,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 +76,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; |