dfu: dfu_nand: use get_nand_dev_by_index()
authorGrygorii Strashko <grygorii.strashko@ti.com>
Tue, 27 Jun 2017 00:12:53 +0000 (19:12 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 12 Jul 2017 02:41:45 +0000 (22:41 -0400)
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>
drivers/dfu/dfu_nand.c

index 23f15716e09413284e826a07c653c14ab1420626..97cd608e30868d3eaf6b61f73d705db164d6feba 100644 (file)
@@ -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) {