Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f1cdd63fe904869310fefb0361c94c51744eada4
Commit: f1cdd63fe904869310fefb0361c94c51744eada4
Parent: 9109a30e5a548b39463b5a777943cf103da507af
Author: Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 9 19:10:52 2008 +0900
Committer: Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Thu Feb 14 14:22:10 2008 +0900
sh: Use max_t in io_trapped.
Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
arch/sh/kernel/io_trapped.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 0bfdc9a..227547b 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -20,7 +20,6 @@
#include <asm/io_trapped.h>
#define TRAPPED_PAGES_MAX 16
-#define MAX(a, b) (((a) >= (b)) ? (a) : (b))
#ifdef CONFIG_HAS_IOPORT
LIST_HEAD(trapped_io);
@@ -211,7 +210,9 @@ static unsigned long from_device(void *dst, const void
*src, unsigned long cnt)
if (!src_addr)
return cnt;
- tmp = copy_word(src_addr, MAX(cnt, (tiop->minimum_bus_width / 8)),
+ tmp = copy_word(src_addr,
+ max_t(unsigned long, cnt,
+ (tiop->minimum_bus_width / 8)),
(unsigned long)dst, cnt);
pr_debug("trapped io read 0x%08lx -> 0x%08llx\n", src_addr, tmp);
@@ -233,7 +234,8 @@ static unsigned long to_device(void *dst, const void *src,
unsigned long cnt)
return cnt;
tmp = copy_word((unsigned long)src, cnt,
- dst_addr, MAX(cnt, (tiop->minimum_bus_width / 8)));
+ dst_addr, max_t(unsigned long, cnt,
+ (tiop->minimum_bus_width / 8)));
pr_debug("trapped io write 0x%08lx -> 0x%08llx\n", dst_addr, tmp);
return 0;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
