diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-11-20 10:02:32 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-12-07 10:54:42 +0100 |
| commit | 1e809f7ef4d2402e31e4bc2f76753b9d3b1e0b6c (patch) | |
| tree | a2ca92d1b741567afe71be3814a981208e0b3638 /drivers/mtd/nand | |
| parent | 5b47f407810369e21f2c3123c13e29ff8609a7e4 (diff) | |
| download | blackbird-obmc-linux-1e809f7ef4d2402e31e4bc2f76753b9d3b1e0b6c.tar.gz blackbird-obmc-linux-1e809f7ef4d2402e31e4bc2f76753b9d3b1e0b6c.zip | |
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>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/fsmc_nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c index 01044b858a93..23d00a2c926f 100644 --- 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; |
