summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Genoud <richard.genoud@gmail.com>2012-12-13 00:47:36 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:46 -0500
commitfb7e16cc1c1f5d5bb212118b89218b2e706226b2 (patch)
tree701e85f23b11cc71764b3332a7290f4eaaea7647
parentc7db645a6b0e6ed8ffa9c53a5c41430b95c20bcc (diff)
FAT: use toupper/tolower instead of recoding them
toupper/tolower function are already declared, so use them. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
-rw-r--r--fs/fat/fat.c3
-rw-r--r--fs/fat/fat_write.c3
-rw-r--r--include/fat.h3
3 files changed, 4 insertions, 5 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 25d3318cd0a..7bb5dba4e29 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -33,6 +33,7 @@
#include <part.h>
#include <malloc.h>
#include <linux/compiler.h>
+#include <linux/ctype.h>
/*
* Convert a string to lowercase.
@@ -40,7 +41,7 @@
static void downcase(char *str)
{
while (*str != '\0') {
- TOLOWER(*str);
+ *str = tolower(*str);
str++;
}
}
diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index 4a1bda0a37e..819c33b1abd 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -28,6 +28,7 @@
#include <fat.h>
#include <asm/byteorder.h>
#include <part.h>
+#include <linux/ctype.h>
#include "fat.c"
static void uppercase(char *str, int len)
@@ -35,7 +36,7 @@ static void uppercase(char *str, int len)
int i;
for (i = 0; i < len; i++) {
- TOUPPER(*str);
+ *str = toupper(*str);
str++;
}
}
diff --git a/include/fat.h b/include/fat.h
index 706cd7a4bd3..b28c3fd6685 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -98,9 +98,6 @@
#endif
#endif
-#define TOLOWER(c) if((c) >= 'A' && (c) <= 'Z'){(c)+=('a' - 'A');}
-#define TOUPPER(c) if ((c) >= 'a' && (c) <= 'z') \
- (c) -= ('a' - 'A');
#define START(dent) (FAT2CPU16((dent)->start) \
+ (mydata->fatsize != 32 ? 0 : \
(FAT2CPU16((dent)->starthi) << 16)))