Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] janitor: sh: hd64465: minmax-removal

Browse source 
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Michael Veeck 2005-09-10 00:27:13 -07:00 committed by Linus Torvalds
parent 0e8bbf59bd
commit 31a34571e5
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/sh/cchips/hd6446x/hd64465/io.c
View file

@ -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 long hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP];
static unsigned char hd64465_iomap_hi_shift[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)) #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x))
void hd64465_port_map(unsigned short baseport, unsigned int nports, 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)); 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 < endport && port < HD64465_IOMAP_HI_THRESH ;
port += (1<<HD64465_IOMAP_HI_SHIFT)) { port += (1<<HD64465_IOMAP_HI_SHIFT)) {
DPRINTK(" maphi[0x%x] = 0x%08lx\n", port, addr); DPRINTK(" maphi[0x%x] = 0x%08lx\n", port, addr);
@ -95,7 +91,7 @@ void hd64465_port_unmap(unsigned short baseport, unsigned int nports)
hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = 0; 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 < endport && port < HD64465_IOMAP_HI_THRESH ;
port += (1<<HD64465_IOMAP_HI_SHIFT)) { port += (1<<HD64465_IOMAP_HI_SHIFT)) {
hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0; hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0;