summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorAlexander Clouter <alex@digriz.org.uk>2011-03-05 11:31:04 +0000
committerNicolas Pitre <nico@fluxnic.net>2011-03-05 14:47:35 -0500
commit53936c56dcaf1db818fe953ae05592a8b5e345b5 (patch)
tree97b5efba31a8060f86ad1a8541463fe675703dc3 /arch/arm/mach-orion5x
parentb3882330843650b751817712db57b9a7061e7879 (diff)
downloadlinux-53936c56dcaf1db818fe953ae05592a8b5e345b5.tar.gz
linux-53936c56dcaf1db818fe953ae05592a8b5e345b5.tar.bz2
linux-53936c56dcaf1db818fe953ae05592a8b5e345b5.zip
ARM: orion5x: fix compiler cast warnings in ts78xx-setup.c
Signed-off-by: Alexander Clouter <alex@digriz.org.uk> [np: used min_t() as suggested by Sergei Shtylyov <sshtylyov@mvista.com>] Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-orion5x')
-rw-r--r--arch/arm/mach-orion5x/ts78xx-setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 3f2e1cdf11f6..8554707d20a9 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -200,7 +200,7 @@ static void ts78xx_ts_nand_write_buf(struct mtd_info *mtd,
int sz;
if (off) {
- sz = min(4 - off, len);
+ sz = min_t(int, 4 - off, len);
writesb(io_base, buf, sz);
buf += sz;
len -= sz;
@@ -227,7 +227,7 @@ static void ts78xx_ts_nand_read_buf(struct mtd_info *mtd,
int sz;
if (off) {
- sz = min(4 - off, len);
+ sz = min_t(int, 4 - off, len);
readsb(io_base, buf, sz);
buf += sz;
len -= sz;