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

struct nand_chip now embeds an mtd device. Make use of this mtd instance.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index dca816298aef0709f6e9d758d82508385d716865..c05723b4d7734e49acd00d4de901932bbedb7647 100644 (file)
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -182,7 +182,6 @@ struct brcmnand_host {
        struct list_head        node;
 
        struct nand_chip        chip;
-       struct mtd_info         mtd;
        struct platform_device  *pdev;
        int                     cs;
 
@@ -1078,7 +1077,7 @@ static int brcmnand_low_level_op(struct brcmnand_host *host,
                                 enum brcmnand_llop_type type, u32 data,
                                 bool last_op)
 {
-       struct mtd_info *mtd = &host->mtd;
+       struct mtd_info *mtd = nand_to_mtd(&host->chip);
        struct nand_chip *chip = &host->chip;
        struct brcmnand_controller *ctrl = host->ctrl;
        u32 tmp;
@@ -1806,7 +1805,7 @@ static inline int get_blk_adr_bytes(u64 size, u32 writesize)
 
 static int brcmnand_setup_dev(struct brcmnand_host *host)
 {
-       struct mtd_info *mtd = &host->mtd;
+       struct mtd_info *mtd = nand_to_mtd(&host->chip);
        struct nand_chip *chip = &host->chip;
        struct brcmnand_controller *ctrl = host->ctrl;
        struct brcmnand_cfg *cfg = &host->hwcfg;
@@ -1920,7 +1919,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
                return -ENXIO;
        }
 
-       mtd = &host->mtd;
+       mtd = nand_to_mtd(&host->chip);
        chip = &host->chip;
 
        nand_set_flash_node(chip, dn);
@@ -2064,8 +2063,8 @@ static int brcmnand_resume(struct device *dev)
        }
 
        list_for_each_entry(host, &ctrl->host_list, node) {
-               struct mtd_info *mtd = &host->mtd;
-               struct nand_chip *chip = mtd_to_nand(mtd);
+               struct nand_chip *chip = &host->chip;
+               struct mtd_info *mtd = nand_to_mtd(chip);
 
                brcmnand_save_restore_cs_config(host, 1);
 
@@ -2296,7 +2295,7 @@ int brcmnand_remove(struct platform_device *pdev)
        struct brcmnand_host *host;
 
        list_for_each_entry(host, &ctrl->host_list, node)
-               nand_release(&host->mtd);
+               nand_release(nand_to_mtd(&host->chip));
 
        clk_disable_unprepare(ctrl->clk);