diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
| commit | 355d1e24f6143c4839be3c015c191421c4e9449c (patch) | |
| tree | ff68e868d404d117f3f9599740f83fd73c99c306 /drivers/mtd/mtdcore.c | |
| parent | f055f2e5a2038002519e5b9affbf259345f4ade9 (diff) | |
| parent | b9cfd8b0911209e2ebec887e497510ee42f9e788 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-spi
- Fix mtd erase with mtdpart (Marek Behún)
- NXP fspi driver fixes (Kuldeep Singh)
Diffstat (limited to 'drivers/mtd/mtdcore.c')
| -rw-r--r-- | drivers/mtd/mtdcore.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 9496903e861..1d45fb55c72 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -906,13 +906,6 @@ void __put_mtd_device(struct mtd_info *mtd) } EXPORT_SYMBOL_GPL(__put_mtd_device); -/* - * Erase is an asynchronous operation. Device drivers are supposed - * to call instr->callback() whenever the operation completes, even - * if it completes with a failure. - * Callers are supposed to pass a callback function and wait for it - * to be called before writing to the block. - */ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) { if (instr->addr > mtd->size || instr->len > mtd->size - instr->addr) @@ -922,7 +915,6 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN; if (!instr->len) { instr->state = MTD_ERASE_DONE; - mtd_erase_callback(instr); return 0; } return mtd->_erase(mtd, instr); |