dfu: add common function to initiate transaction

[oweals/u-boot.git] / drivers / dfu / dfu_nand.c

diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c
index 9fb874c0bcd4f07c9ab1f6732117f4d7ed5a3c46..6dc9ff7aeaf77b756d244dc69fe1ab4ef657a717 100644 (file)
--- 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]->name) {
+           !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);
@@ -114,9 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu,
        return ret;
 }
 
-long dfu_get_medium_size_nand(struct dfu_entity *dfu)
+int dfu_get_medium_size_nand(struct dfu_entity *dfu, u64 *size)
 {
-       return dfu->data.nand.size;
+       *size = dfu->data.nand.size;
+
+       return 0;
 }
 
 static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf,
@@ -143,18 +145,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]->name) {
+                   !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) {