summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/falcon/mtd.c
diff options
context:
space:
mode:
authorBoris Brezillon2018-02-12 22:03:11 +0100
committerBoris Brezillon2018-03-21 09:50:56 +0100
commite7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e (patch)
treef8aaed7657f3b7af86cdf2b5eade135e0f9f740b /drivers/net/ethernet/sfc/falcon/mtd.c
parentmtd: Unconditionally update ->fail_addr and ->addr in part_erase() (diff)
downloadkernel-qcow2-linux-e7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e.tar.gz
kernel-qcow2-linux-e7bfb3fdbde3bfeeeb64e2d73ac6babe59519c9e.tar.xz
kernel-qcow2-linux-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 <boris.brezillon@bootlin.com> Reviewed-by: Richard Weinberger <richard@nod.at> Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Acked-by: Bert Kenward <bkenward@solarflare.com> --- 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/net/ethernet/sfc/falcon/mtd.c')
-rw-r--r--drivers/net/ethernet/sfc/falcon/mtd.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ethernet/sfc/falcon/mtd.c b/drivers/net/ethernet/sfc/falcon/mtd.c
index cde593cb1052..2d67e4621a3d 100644
--- a/drivers/net/ethernet/sfc/falcon/mtd.c
+++ b/drivers/net/ethernet/sfc/falcon/mtd.c
@@ -24,17 +24,8 @@
static int ef4_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
{
struct ef4_nic *efx = mtd->priv;
- int rc;
- rc = efx->type->mtd_erase(mtd, erase->addr, erase->len);
- if (rc == 0) {
- erase->state = MTD_ERASE_DONE;
- } else {
- erase->state = MTD_ERASE_FAILED;
- erase->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
- }
- mtd_erase_callback(erase);
- return rc;
+ return efx->type->mtd_erase(mtd, erase->addr, erase->len);
}
static void ef4_mtd_sync(struct mtd_info *mtd)