aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-05-30 04:06:41 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-30 04:06:41 -0400
commit7e9a0bb00c4ccb7a05c41b2728758d5bb3dd54fc (patch)
tree40131aa37bf424530108d4a88f494fc6ba98dff7 /drivers
parent098a19811b483f8e047d8292641c88e776452de0 (diff)
[MTD] Fix build warnings (and debug build error) in nand_base.c
drivers/mtd/nand/nand_base.c: In function 'nand_transfer_oob': drivers/mtd/nand/nand_base.c:909: warning: comparison of distinct pointer types lacks a cast drivers/mtd/nand/nand_base.c: In function 'nand_do_read_oob': drivers/mtd/nand/nand_base.c:1097: error: 'len' undeclared (first use in this function) drivers/mtd/nand/nand_base.c:1097: error: (Each undeclared identifier is reported only once drivers/mtd/nand/nand_base.c:1097: error: for each function it appears in.) drivers/mtd/nand/nand_base.c: In function 'nand_fill_oob': drivers/mtd/nand/nand_base.c:1411: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/nand_base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index ea6d2c334aed..77406fcf53b3 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -912,7 +912,7 @@ static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
912 size_t bytes; 912 size_t bytes;
913 913
914 for(; free->length && len; free++, len -= bytes) { 914 for(; free->length && len; free++, len -= bytes) {
915 bytes = min(len, free->length); 915 bytes = min_t(size_t, len, free->length);
916 916
917 memcpy(oob, chip->oob_poi + free->offset, bytes); 917 memcpy(oob, chip->oob_poi + free->offset, bytes);
918 oob += bytes; 918 oob += bytes;
@@ -1100,8 +1100,8 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
1100 int direct, bytes, readlen = ops->len; 1100 int direct, bytes, readlen = ops->len;
1101 uint8_t *bufpoi, *buf = ops->oobbuf; 1101 uint8_t *bufpoi, *buf = ops->oobbuf;
1102 1102
1103 DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08x, len = %i\n", 1103 DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n",
1104 (unsigned int)from, (int)len); 1104 (unsigned long long)from, readlen);
1105 1105
1106 chipnr = (int)(from >> chip->chip_shift); 1106 chipnr = (int)(from >> chip->chip_shift);
1107 chip->select_chip(mtd, chipnr); 1107 chip->select_chip(mtd, chipnr);
@@ -1414,7 +1414,7 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
1414 size_t bytes; 1414 size_t bytes;
1415 1415
1416 for(; free->length && len; free++, len -= bytes) { 1416 for(; free->length && len; free++, len -= bytes) {
1417 bytes = min(len, free->length); 1417 bytes = min_t(size_t, len, free->length);
1418 memcpy(chip->oob_poi + free->offset, oob, bytes); 1418 memcpy(chip->oob_poi + free->offset, oob, bytes);
1419 oob += bytes; 1419 oob += bytes;
1420 } 1420 }