mtd: rawnand: fsmc: Make conversion from chip to fsmc consistent

nand_to_fsmc() is used almost everywhere except in
fsmc_setup_data_interface() where nand_get_controller_data() is used
instead. Make that consistent and drop the nand_set_controller_data()
call in the probe path.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c
index 01044b858a9348522b07fe105c636fff68c737a2..23d00a2c926f04b07d603316f8f007751d34fc20 100644 (file)
--- a/drivers/mtd/nand/raw/fsmc_nand.c
+++ b/drivers/mtd/nand/raw/fsmc_nand.c
@@ -344,7 +344,7 @@ static int fsmc_calc_timings(struct fsmc_nand_data *host,
 static int fsmc_setup_data_interface(struct nand_chip *nand, int csline,
                                     const struct nand_data_interface *conf)
 {
-       struct fsmc_nand_data *host = nand_get_controller_data(nand);
+       struct fsmc_nand_data *host = nand_to_fsmc(nand);
        struct fsmc_nand_timings tims;
        const struct nand_sdr_timings *sdrt;
        int ret;
@@ -1076,7 +1076,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
 
        /* Link all private pointers */
        mtd = nand_to_mtd(&host->nand);
-       nand_set_controller_data(nand, host);
        nand_set_flash_node(nand, pdev->dev.of_node);
 
        mtd->dev.parent = &pdev->dev;