1 From eb94555e9e97c9983461214046b4d72c4ab4ba70 Mon Sep 17 00:00:00 2001
2 From: Miquel Raynal <miquel.raynal@free-electrons.com>
3 Date: Thu, 30 Nov 2017 18:01:28 +0100
4 Subject: [PATCH] mtd: nand: use usual return values for the ->erase() hook
6 Avoid using specific defined values for checking returned status of the
7 ->erase() hook. Instead, use usual negative error values on failure,
10 Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
11 Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
12 Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
14 drivers/mtd/nand/denali.c | 2 +-
15 drivers/mtd/nand/docg4.c | 7 ++++++-
16 drivers/mtd/nand/nand_base.c | 10 ++++++++--
17 3 files changed, 15 insertions(+), 4 deletions(-)
19 --- a/drivers/mtd/nand/nand_base.c
20 +++ b/drivers/mtd/nand/nand_base.c
21 @@ -2994,11 +2994,17 @@ out:
22 static int single_erase(struct mtd_info *mtd, int page)
24 struct nand_chip *chip = mtd_to_nand(mtd);
27 /* Send commands to erase a block */
28 chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
29 chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
31 - return chip->waitfunc(mtd, chip);
32 + status = chip->waitfunc(mtd, chip);
36 + return status & NAND_STATUS_FAIL ? -EIO : 0;
40 @@ -3082,7 +3088,7 @@ int nand_erase_nand(struct mtd_info *mtd
41 status = chip->erase(mtd, page & chip->pagemask);
43 /* See if block erase succeeded */
44 - if (status & NAND_STATUS_FAIL) {
46 pr_debug("%s: failed erase, page 0x%08x\n",
48 instr->state = MTD_ERASE_FAILED;