diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-29 11:22:46 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-06 14:08:10 +0100 |
commit | 8174fc9dbd5f1372c7ba6e3ab9485b364f6410fc (patch) | |
tree | 28d2fa0bc70a5757d3a70d86f9580b54fed5a3db /drivers/mtd/nand | |
parent | ea7fdd5f550a63f45a90f76cb1ac1e1eeecffe00 (diff) | |
download | barebox-8174fc9dbd5f1372c7ba6e3ab9485b364f6410fc.tar.gz barebox-8174fc9dbd5f1372c7ba6e3ab9485b364f6410fc.tar.xz |
mtd: Drop asynchronous erase support
asynchronous erase support is unused and also dropped from the Kernel,
so remove it from barebox.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 3f4c787f49..2b37679d2a 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -952,7 +952,6 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) if (nand_check_wp(mtd)) { pr_debug("%s: device is write protected!\n", __func__); - status = MTD_ERASE_FAILED; ret = -EIO; goto out; } @@ -2721,15 +2720,13 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, if (nand_check_wp(mtd)) { pr_debug("%s: device is write protected!\n", __func__); - instr->state = MTD_ERASE_FAILED; + ret = -EIO; goto erase_exit; } /* Loop through the pages */ len = instr->len; - instr->state = MTD_ERASING; - while (len) { /* Check if we have a bad block, we do not erase bad blocks! */ if (!mtd->allow_erasebad && @@ -2737,7 +2734,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, chip->page_shift, 0, allowbbt)) { pr_warn("%s: attempt to erase a bad block at page 0x%08x\n", __func__, page); - instr->state = MTD_ERASE_FAILED; + ret = -EIO; goto erase_exit; } @@ -2765,7 +2762,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, if (status & NAND_STATUS_FAIL) { pr_debug("%s: failed erase, page 0x%08x\n", __func__, page); - instr->state = MTD_ERASE_FAILED; + ret = -EIO; instr->fail_addr = ((loff_t)page << chip->page_shift); goto erase_exit; @@ -2782,20 +2779,14 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, chip->select_chip(mtd, chipnr); } } - instr->state = MTD_ERASE_DONE; - -erase_exit: - ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO; + ret = 0; +erase_exit: /* Deselect and wake up anyone waiting on the device */ chip->select_chip(mtd, -1); nand_release_device(mtd); - /* Do call back function */ - if (!ret) - mtd_erase_callback(instr); - /* Return more or less happy */ return ret; } |