diff options
| author | Boris Brezillon <[email protected]> | 2018-02-12 21:03:11 +0000 |
|---|---|---|
| committer | Boris Brezillon <[email protected]> | 2018-03-21 08:50:56 +0000 |
| commit | e7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e (patch) | |
| tree | f8aaed7657f3b7af86cdf2b5eade135e0f9f740b /drivers/mtd/lpddr/lpddr2_nvm.c | |
| parent | mtd: Unconditionally update ->fail_addr and ->addr in part_erase() (diff) | |
| download | kernel-e7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e.tar.gz kernel-e7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e.zip | |
mtd: Stop updating erase_info->state and calling mtd_erase_callback()
MTD users are no longer checking erase_info->state to determine if the
erase operation failed or succeeded. Moreover, mtd_erase_callback() is
now a NOP.
We can safely get rid of all mtd_erase_callback() calls and all
erase_info->state assignments. While at it, get rid of the
erase_info->state field, all MTD_ERASE_XXX definitions and the
mtd_erase_callback() function.
Signed-off-by: Boris Brezillon <[email protected]>
Reviewed-by: Richard Weinberger <[email protected]>
Reviewed-by: Miquel Raynal <[email protected]>
Acked-by: Bert Kenward <[email protected]>
---
Changes in v2:
- Address a few coding style issues (reported by Miquel)
- Remove comments that are no longer valid (reported by Miquel)
Diffstat (limited to 'drivers/mtd/lpddr/lpddr2_nvm.c')
| -rw-r--r-- | drivers/mtd/lpddr/lpddr2_nvm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c index 2342277c9bcb..5d73db2a496d 100644 --- a/drivers/mtd/lpddr/lpddr2_nvm.c +++ b/drivers/mtd/lpddr/lpddr2_nvm.c @@ -380,14 +380,8 @@ out: */ static int lpddr2_nvm_erase(struct mtd_info *mtd, struct erase_info *instr) { - int ret = lpddr2_nvm_do_block_op(mtd, instr->addr, instr->len, - LPDDR2_NVM_ERASE); - if (!ret) { - instr->state = MTD_ERASE_DONE; - mtd_erase_callback(instr); - } - - return ret; + return lpddr2_nvm_do_block_op(mtd, instr->addr, instr->len, + LPDDR2_NVM_ERASE); } /* |