diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-11-10 15:07:38 +0100 |
| commit | 7b1d8b4b3561c043a79d5933a7c1eb9266dc328d (patch) | |
| tree | 9c398aa20e22763a239d11eecf6fb4c1d06d4c97 /drivers/mtd/devices/docg3.c | |
| parent | 0b0eada569b198aa3882cfec5874bc35a8a0fa14 (diff) | |
| parent | 4db0f1c3dbe6173fdf91cbeb83e250719332c6a3 (diff) | |
| download | barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.gz barebox-7b1d8b4b3561c043a79d5933a7c1eb9266dc328d.tar.xz | |
Merge branch 'for-next/mtd-nand'
Diffstat (limited to 'drivers/mtd/devices/docg3.c')
| -rw-r--r-- | drivers/mtd/devices/docg3.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index a40ba25632..cb0bb5cfec 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@ -852,7 +852,6 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *info) doc_dbg("doc_erase(from=%lld, len=%lld\n", info->addr, info->len); doc_set_device_id(docg3, docg3->device_id); - info->state = MTD_ERASE_PENDING; calc_block_sector(info->addr + info->len, &block0, &block1, &page, &ofs, docg3->reliable); ret = -EINVAL; @@ -864,7 +863,6 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *info) docg3->reliable); doc_set_reliable_mode(docg3); for (len = info->len; !ret && len > 0; len -= mtd->erasesize) { - info->state = MTD_ERASING; ret = doc_erase_block(docg3, block0, block1); block0 += 2; block1 += 2; @@ -873,11 +871,9 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *info) if (ret) goto reset_err; - info->state = MTD_ERASE_DONE; return 0; reset_err: - info->state = MTD_ERASE_FAILED; return ret; } @@ -1073,13 +1069,13 @@ static void __init doc_set_driver_info(int chip_id, struct mtd_info *mtd) mtd->erasesize /= 2; mtd->writesize = DOC_LAYOUT_PAGE_SIZE; mtd->oobsize = DOC_LAYOUT_OOB_SIZE; - mtd->read = doc_read; - mtd->read_oob = doc_read_oob; - mtd->block_isbad = doc_block_isbad; + mtd->_read = doc_read; + mtd->_read_oob = doc_read_oob; + mtd->_block_isbad = doc_block_isbad; #ifdef CONFIG_MTD_WRITE - mtd->erase = doc_erase; - mtd->write = doc_write; - mtd->write_oob = doc_write_oob; + mtd->_erase = doc_erase; + mtd->_write = doc_write; + mtd->_write_oob = doc_write_oob; #endif } @@ -1176,7 +1172,7 @@ static int __init docg3_probe(struct device_d *dev) continue; } docg3_floors[floor] = mtd; - mtd->parent = dev; + mtd->dev.parent = dev; ret = add_mtd_device(mtd, NULL, DEVICE_ID_DYNAMIC); if (ret) goto err_probe; |