diff options
| author | Grygorii Strashko <grygorii.strashko@ti.com> | 2017-06-26 19:12:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-11 22:41:45 -0400 |
| commit | 16520189918ef7cbebbb3022e0674fd7e365ab03 (patch) | |
| tree | f83762aba1b655e7a2f696ddc35b96f3b79916db /drivers | |
| parent | a94a2619397c8e19ef97796e2ca37a274fa64bcd (diff) | |
| download | u-boot-16520189918ef7cbebbb3022e0674fd7e365ab03.tar.gz u-boot-16520189918ef7cbebbb3022e0674fd7e365ab03.tar.xz u-boot-16520189918ef7cbebbb3022e0674fd7e365ab03.zip | |
dfu: dfu_nand: use get_nand_dev_by_index()
As part of preparation for nand DM conversion the new API has been
introduced to remove direct access to nand_info array. So, use it here
instead of accessing to nand_info array directly.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dfu/dfu_nand.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c index 23f15716e0..97cd608e30 100644 --- a/drivers/dfu/dfu_nand.c +++ b/drivers/dfu/dfu_nand.c @@ -37,15 +37,15 @@ static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu, lim = dfu->data.nand.start + dfu->data.nand.size - start; count = *len; + mtd = get_nand_dev_by_index(nand_curr_device); + if (nand_curr_device < 0 || nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE || - !nand_info[nand_curr_device]) { + !mtd) { printf("%s: invalid nand device\n", __func__); return -1; } - mtd = nand_info[nand_curr_device]; - if (op == DFU_OP_READ) { ret = nand_read_skip_bad(mtd, start, &count, &actual, lim, buf); @@ -143,18 +143,16 @@ static int dfu_flush_medium_nand(struct dfu_entity *dfu) /* in case of ubi partition, erase rest of the partition */ if (dfu->data.nand.ubi) { - struct mtd_info *mtd; + struct mtd_info *mtd = get_nand_dev_by_index(nand_curr_device); nand_erase_options_t opts; if (nand_curr_device < 0 || nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE || - !nand_info[nand_curr_device]) { + !mtd) { printf("%s: invalid nand device\n", __func__); return -1; } - mtd = nand_info[nand_curr_device]; - memset(&opts, 0, sizeof(opts)); off = dfu->offset; if ((off & (mtd->erasesize - 1)) != 0) { |