nand: Embed mtd_info in struct nand_chip

[karo-tx-uboot.git] / fs / yaffs2 / yaffs_uboot_glue.c

diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index 5e9902519a7d35d5c05a011b5f8daa9ed47e5de1..6d8687148da586a1a758de288c3c3c0be298974f 100644 (file)
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -141,8 +141,6 @@ static const char *yaffs_error_str(void)
        }
 }
 
-extern struct mtd_info nand_info[];
-
 void cmd_yaffs_tracemask(unsigned set, unsigned mask)
 {
        if (set)
@@ -171,7 +169,7 @@ void cmd_yaffs_devconfig(char *_mp, int flash_dev,
        dev = calloc(1, sizeof(*dev));
        mp = strdup(_mp);
 
-       mtd = &nand_info[flash_dev];
+       mtd = nand_info[flash_dev];
 
        if (!dev || !mp) {
                /* Alloc error */
@@ -260,9 +258,7 @@ void cmd_yaffs_dev_ls(void)
                dev = yaffs_next_dev();
                if (!dev)
                        return;
-               flash_dev =
-                       ((unsigned) dev->driver_context - (unsigned) nand_info)/
-                               sizeof(nand_info[0]);
+               flash_dev = nand_mtd_to_devnum(dev->driver_context);
                printf("%-10s %5d 0x%05x 0x%05x %s",
                        dev->param.name, flash_dev,
                        dev->param.start_block, dev->param.end_block,