cris: nand: use the mtd instance embedded in struct nand_chip

struct nand_chip now embeds an mtd device. Patch all drivers to make use
of this mtd instance instead of using the instance embedded in their
private struct or dynamically allocated.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index db953cfabee11c4021f907e812c36341bd6db3ac..ee74e45a5cf4dc556ee74d2b6c575c86b79377df 100644 (file)
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -36,7 +36,6 @@
 #define CE_BIT 12
 
 struct mtd_info_wrapper {
-       struct mtd_info info;
        struct nand_chip chip;
 };
 
@@ -148,7 +147,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
 
        /* Get pointer to private data */
        this = &wrapper->chip;
-       crisv32_mtd = &wrapper->info;
+       crisv32_mtd = nand_to_mtd(this);
 
        /* Link the private data with the MTD structure */
        crisv32_mtd->priv = this;

diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index 22a6467ffe1f1d4cd75ab7ed36914609cc83696a..56262973ed2b2de5db819837e71e416c2498140d 100644 (file)
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -31,7 +31,6 @@
 #define BY_BIT 7
 
 struct mtd_info_wrapper {
-       struct mtd_info info;
        struct nand_chip chip;
 };
 
@@ -129,7 +128,7 @@ struct mtd_info *__init crisv32_nand_flash_probe(void)
 
        /* Get pointer to private data */
        this = &wrapper->chip;
-       crisv32_mtd = &wrapper->info;
+       crisv32_mtd = nand_to_mtd(this);
 
        pa_oe.oe |= 1 << CE_BIT;
        pa_oe.oe |= 1 << ALE_BIT;