From: Andrew Morton 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 Cc: David Woodhouse Signed-off-by: Andrew Morton --- drivers/mtd/nand/nand_base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/mtd/nand/nand_base.c~git-mtd-ya-build-fix drivers/mtd/nand/nand_base.c --- devel/drivers/mtd/nand/nand_base.c~git-mtd-ya-build-fix 2006-05-29 19:50:32.000000000 -0700 +++ devel-akpm/drivers/mtd/nand/nand_base.c 2006-05-29 19:52:18.000000000 -0700 @@ -906,7 +906,7 @@ static uint8_t *nand_transfer_oob(struct size_t bytes; for(; free->length && len; free++, len -= bytes) { - bytes = min(len, free->length); + bytes = min_t(size_t, len, free->length); memcpy(oob, chip->oob_poi + free->offset, bytes); oob += bytes; @@ -1094,8 +1094,8 @@ static int nand_do_read_oob(struct mtd_i int direct, bytes, readlen = ops->len; uint8_t *bufpoi, *buf = ops->oobbuf; - DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08x, len = %i\n", - (unsigned int)from, (int)len); + DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n", + (unsigned long long)from, readlen); chipnr = (int)(from >> chip->chip_shift); chip->select_chip(mtd, chipnr); @@ -1408,7 +1408,7 @@ static uint8_t *nand_fill_oob(struct nan size_t bytes; for(; free->length && len; free++, len -= bytes) { - bytes = min(len, free->length); + bytes = min_t(size_t, len, free->length); memcpy(chip->oob_poi + free->offset, oob, bytes); oob += bytes; } _