cmd: nand: abstract global variable usage for dm conversion

nand_info is used all over the file so abstract it with
get_nand_dev_by_index() which will help for DM conversion.

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

diff --git a/cmd/nand.c b/cmd/nand.c
index 72ca88a943c5d795d4b4631ee52c2b0511b75b2b..d6542e50f2e916c95cdfa41702d568f07b6fe9c9 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -115,20 +115,20 @@ free_dat:
 
 static int set_dev(int dev)
 {
-       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev]) {
-               puts("No such device\n");
-               return -1;
-       }
+       struct mtd_info *mtd = get_nand_dev_by_index(dev);
+
+       if (!mtd)
+               return -ENODEV;
 
        if (nand_curr_device == dev)
                return 0;
 
-       printf("Device %d: %s", dev, nand_info[dev]->name);
+       printf("Device %d: %s", dev, mtd->name);
        puts("... is now current device\n");
        nand_curr_device = dev;
 
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
-       board_nand_select_device(nand_info[dev]->priv, dev);
+       board_nand_select_device(mtd->priv, dev);
 #endif
 
        return 0;
@@ -188,7 +188,7 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[])
 {
        int ret;
        uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
-       struct mtd_info *mtd = nand_info[0];
+       struct mtd_info *mtd = get_nand_dev_by_index(0);
        char *cmd = argv[1];
 
        if (CONFIG_SYS_MAX_NAND_DEVICE == 0 || !mtd) {
@@ -213,9 +213,10 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[])
                if (argc < 3)
                        goto usage;
 
+               mtd = get_nand_dev_by_index(idx);
                /* We don't care about size, or maxsize. */
                if (mtd_arg_off(argv[2], &idx, &addr, &maxsize, &maxsize,
-                               MTD_DEV_TYPE_NAND, nand_info[idx]->size)) {
+                               MTD_DEV_TYPE_NAND, mtd->size)) {
                        puts("Offset or partition name expected\n");
                        return 1;
                }
@@ -283,9 +284,14 @@ usage:
 
 static void nand_print_and_set_info(int idx)
 {
-       struct mtd_info *mtd = nand_info[idx];
-       struct nand_chip *chip = mtd_to_nand(mtd);
+       struct mtd_info *mtd;
+       struct nand_chip *chip;
+
+       mtd = get_nand_dev_by_index(idx);
+       if (!mtd)
+               return;
 
+       chip = mtd_to_nand(mtd);
        printf("Device %d: ", idx);
        if (chip->numchips > 1)
                printf("%dx ", chip->numchips);
@@ -348,7 +354,7 @@ static void adjust_size_for_badblocks(loff_t *size, loff_t offset, int dev)
        /* We grab the nand info object here fresh because this is usually
         * called after arg_off_size() which can change the value of dev.
         */
-       struct mtd_info *mtd = nand_info[dev];
+       struct mtd_info *mtd = get_nand_dev_by_index(dev);
        loff_t maxoffset = offset + *size;
        int badblocks = 0;
 
@@ -397,10 +403,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (strcmp(cmd, "info") == 0) {
 
                putc('\n');
-               for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
-                       if (nand_info[i])
-                               nand_print_and_set_info(i);
-               }
+               for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
+                       nand_print_and_set_info(i);
                return 0;
        }
 
@@ -432,12 +436,11 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
         * one before these commands can run, even if a partition specifier
         * for another device is to be used.
         */
-       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE ||
-           !nand_info[dev]) {
+       mtd = get_nand_dev_by_index(dev);
+       if (!mtd) {
                puts("\nno devices available\n");
                return 1;
        }
-       mtd = nand_info[dev];
 
        if (strcmp(cmd, "bad") == 0) {
                printf("\nDevice %d bad blocks:\n", dev);
@@ -496,13 +499,13 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                /* skip first two or three arguments, look for offset and size */
                if (mtd_arg_off_size(argc - o, argv + o, &dev, &off, &size,
                                     &maxsize, MTD_DEV_TYPE_NAND,
-                                    nand_info[dev]->size) != 0)
+                                    mtd->size) != 0)
                        return 1;
 
                if (set_dev(dev))
                        return 1;
 
-               mtd = nand_info[dev];
+               mtd = get_nand_dev_by_index(dev);
 
                memset(&opts, 0, sizeof(opts));
                opts.offset = off;
@@ -565,13 +568,13 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                        if (mtd_arg_off(argv[3], &dev, &off, &size, &maxsize,
                                        MTD_DEV_TYPE_NAND,
-                                       nand_info[dev]->size))
+                                       mtd->size))
                                return 1;
 
                        if (set_dev(dev))
                                return 1;
 
-                       mtd = nand_info[dev];
+                       mtd = get_nand_dev_by_index(dev);
 
                        if (argc > 4 && !str2long(argv[4], &pagecount)) {
                                printf("'%s' is not a number\n", argv[4]);
@@ -588,7 +591,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        if (mtd_arg_off_size(argc - 3, argv + 3, &dev, &off,
                                             &size, &maxsize,
                                             MTD_DEV_TYPE_NAND,
-                                            nand_info[dev]->size) != 0)
+                                            mtd->size) != 0)
                                return 1;
 
                        if (set_dev(dev))
@@ -600,7 +603,7 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        rwsize = size;
                }
 
-               mtd = nand_info[dev];
+               mtd = get_nand_dev_by_index(dev);
 
                if (!s || !strcmp(s, ".jffs2") ||
                    !strcmp(s, ".e") || !strcmp(s, ".i")) {
@@ -760,13 +763,15 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                if (mtd_arg_off_size(argc - 2, argv + 2, &dev, &off, &size,
                                     &maxsize, MTD_DEV_TYPE_NAND,
-                                    nand_info[dev]->size) < 0)
+                                    mtd->size) < 0)
                        return 1;
 
                if (set_dev(dev))
                        return 1;
 
-               if (!nand_unlock(nand_info[dev], off, size, allexcept)) {
+               mtd = get_nand_dev_by_index(dev);
+
+               if (!nand_unlock(mtd, off, size, allexcept)) {
                        puts("NAND flash successfully unlocked\n");
                } else {
                        puts("Error unlocking NAND flash, "
@@ -929,6 +934,7 @@ static int do_nandboot(cmd_tbl_t *cmdtp, int flag, int argc,
        char *boot_device = NULL;
        int idx;
        ulong addr, offset = 0;
+       struct mtd_info *mtd;
 #if defined(CONFIG_CMD_MTDPARTS)
        struct mtd_device *dev;
        struct part_info *part;
@@ -948,8 +954,10 @@ static int do_nandboot(cmd_tbl_t *cmdtp, int flag, int argc,
                                addr = simple_strtoul(argv[1], NULL, 16);
                        else
                                addr = CONFIG_SYS_LOAD_ADDR;
-                       return nand_load_image(cmdtp, nand_info[dev->id->num],
-                                              part->offset, addr, argv[0]);
+
+                       mtd = get_nand_dev_by_index(dev->id->num);
+                       return nand_load_image(cmdtp, mtd, part->offset,
+                                              addr, argv[0]);
                }
        }
 #endif
@@ -991,14 +999,15 @@ usage:
 
        idx = simple_strtoul(boot_device, NULL, 16);
 
-       if (idx < 0 || idx >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[idx]) {
+       mtd = get_nand_dev_by_index(idx);
+       if (!mtd) {
                printf("\n** Device %d not available\n", idx);
                bootstage_error(BOOTSTAGE_ID_NAND_AVAILABLE);
                return 1;
        }
        bootstage_mark(BOOTSTAGE_ID_NAND_AVAILABLE);
 
-       return nand_load_image(cmdtp, nand_info[idx], offset, addr, argv[0]);
+       return nand_load_image(cmdtp, mtd, offset, addr, argv[0]);
 }
 
 U_BOOT_CMD(nboot, 4, 1, do_nandboot,

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index 168bac6055dea6be0b64ebcac20c0136f3e15bab..fd9a3be354d0e1e8e941a67305dd2579ca6bcb10 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -19,7 +19,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int nand_curr_device = -1;
 
-
 struct mtd_info *nand_info[CONFIG_SYS_MAX_NAND_DEVICE];
 
 #ifndef CONFIG_SYS_NAND_SELF_INIT
@@ -31,12 +30,21 @@ static char dev_name[CONFIG_SYS_MAX_NAND_DEVICE][8];
 
 static unsigned long total_nand_size; /* in kiB */
 
+struct mtd_info *get_nand_dev_by_index(int dev)
+{
+       if (dev < 0 || dev >= CONFIG_SYS_MAX_NAND_DEVICE || !nand_info[dev] ||
+           !nand_info[dev]->name)
+               return NULL;
+
+       return nand_info[dev];
+}
+
 int nand_mtd_to_devnum(struct mtd_info *mtd)
 {
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(nand_info); i++) {
-               if (mtd && nand_info[i] == mtd)
+       for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
+               if (mtd && get_nand_dev_by_index(i) == mtd)
                        return i;
        }
 
@@ -101,8 +109,9 @@ static void create_mtd_concat(void)
        int i;
 
        for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) {
-               if (nand_info[i] != NULL) {
-                       nand_info_list[nand_devices_found] = nand_info[i];
+               struct mtd_info *mtd = get_nand_dev_by_index(i);
+               if (mtd != NULL) {
+                       nand_info_list[nand_devices_found] = mtd;
                        nand_devices_found++;
                }
        }
@@ -161,7 +170,7 @@ void nand_init(void)
        /*
         * Select the chip in the board/cpu specific driver
         */
-       board_nand_select_device(mtd_to_nand(nand_info[nand_curr_device]),
+       board_nand_select_device(mtd_to_nand(get_nand_dev_by_index(nand_curr_device)),
                                 nand_curr_device);
 #endif
 

diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
index f4f0de395b75bf4245ff119cb053d6970669f14d..b540bc3f2740d86e53c1e26c8b44132a2a555f46 100644 (file)
--- a/drivers/mtd/nand/omap_gpmc.c
+++ b/drivers/mtd/nand/omap_gpmc.c
@@ -894,17 +894,14 @@ static int omap_select_ecc_scheme(struct nand_chip *nand,
 int __maybe_unused omap_nand_switch_ecc(uint32_t hardware, uint32_t eccstrength)
 {
        struct nand_chip *nand;
-       struct mtd_info *mtd;
+       struct mtd_info *mtd = get_nand_dev_by_index(nand_curr_device);
        int err = 0;
 
-       if (nand_curr_device < 0 ||
-           nand_curr_device >= CONFIG_SYS_MAX_NAND_DEVICE ||
-           !nand_info[nand_curr_device]) {
+       if (!mtd) {
                printf("nand: error: no NAND devices found\n");
                return -ENODEV;
        }
 
-       mtd = nand_info[nand_curr_device];
        nand = mtd_to_nand(mtd);
        nand->options |= NAND_OWN_BUFFERS;
        nand->options &= ~NAND_SUBPAGE_READ;

diff --git a/include/nand.h b/include/nand.h
index bc5dd8190170fa0929e4414a9499389b4055ec0a..c8556e17539dea1ecfeef0359a8812171d8d4a86 100644 (file)
--- a/include/nand.h
+++ b/include/nand.h
@@ -145,4 +145,13 @@ int spl_nand_erase_one(int block, int page);
 /* platform specific init functions */
 void sunxi_nand_init(void);
 
+/*
+ * get_nand_dev_by_index - Get the nand info based in index.
+ *
+ * @dev - index to the nand device.
+ *
+ * returns pointer to the nand device info structure or NULL on failure.
+ */
+struct mtd_info *get_nand_dev_by_index(int dev);
+
 #endif /* _NAND_H_ */