aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/io.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-06-14 01:15:39 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-06-14 01:47:49 -0400
commitf5d5b1f8c12a7637ee1145f2f00358eb375edb54 (patch)
tree5d4b5ec5ef6eba5fb0f5cc1e5127115da33c2759 /drivers/mtd/ubi/io.c
parent095751a6e0838a712393a74eb0b7b6559dbdbe81 (diff)
UBI: fix error message and compilation warnings
Fix the followong compilation warnings introduced by commit 095751a6e0838a712393a74eb0b7b6559dbdbe81: drivers/mtd/ubi/scan.c: In function 'check_what_we_have': drivers/mtd/ubi/scan.c:960: warning: passing argument 1 of 'get_random_bytes' discards qualifiers from pointer target type Fix the following compilation warnings introduced by commit 1a49af2ca019dcb4614c32f832bbcb814b61409c: drivers/mtd/ubi/io.c: In function 'ubi_io_read': drivers/mtd/ubi/io.c:153: warning: initialization makes integer from pointer without a cast drivers/mtd/ubi/io.c:170: warning: format '%s' expects type 'char *', but argument 5 has type 'int' drivers/mtd/ubi/io.c:177: warning: format '%zd' expects type 'signed size_t', but argument 7 has type 'int' drivers/mtd/ubi/io.c:177: warning: too many arguments for format Also, amend the ECC error code string and add brackets and whitespace there - this should make the message readable. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/ubi/io.c')
-rw-r--r--drivers/mtd/ubi/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index ffb230339558..332f992f13d9 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -150,7 +150,7 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset,
150retry: 150retry:
151 err = ubi->mtd->read(ubi->mtd, addr, len, &read, buf); 151 err = ubi->mtd->read(ubi->mtd, addr, len, &read, buf);
152 if (err) { 152 if (err) {
153 const char errstr = (err == -EBADMSG) ? "ECC error" : ""; 153 const char *errstr = (err == -EBADMSG) ? " (ECC error)" : "";
154 154
155 if (err == -EUCLEAN) { 155 if (err == -EUCLEAN) {
156 /* 156 /*
@@ -174,7 +174,7 @@ retry:
174 goto retry; 174 goto retry;
175 } 175 }
176 176
177 ubi_err("error %d while reading %d bytes from PEB %d:%d, " 177 ubi_err("error %d%s while reading %d bytes from PEB %d:%d, "
178 "read %zd bytes", err, errstr, len, pnum, offset, read); 178 "read %zd bytes", err, errstr, len, pnum, offset, read);
179 ubi_dbg_dump_stack(); 179 ubi_dbg_dump_stack();
180 180