summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/raw/plat_nand.c
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@bootlin.com>2018-09-06 14:05:27 +0200
committerMiquel Raynal <miquel.raynal@bootlin.com>2018-10-03 11:12:25 +0200
commit50a487e7719caa07e951dfcfd983b2c5517e2f76 (patch)
treec54dad4e68655702645663658e56c2b7e6d9f488 /drivers/mtd/nand/raw/plat_nand.c
parent0f808c1602bc75c74399989d47842197118f7e72 (diff)
mtd: rawnand: Pass a nand_chip object to chip->dev_ready()
Let's make the raw NAND API consistent by patching all helpers and hooks to take a nand_chip object instead of an mtd_info one or remove the mtd_info object when both are passed. Let's tackle the chip->dev_ready() hook. Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Diffstat (limited to 'drivers/mtd/nand/raw/plat_nand.c')
-rw-r--r--drivers/mtd/nand/raw/plat_nand.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/mtd/nand/raw/plat_nand.c b/drivers/mtd/nand/raw/plat_nand.c
index bfb5d8e7b00b..d65e4084dea4 100644
--- a/drivers/mtd/nand/raw/plat_nand.c
+++ b/drivers/mtd/nand/raw/plat_nand.c
@@ -23,13 +23,6 @@ struct plat_nand_data {
void __iomem *io_base;
};
-static int plat_nand_dev_ready(struct mtd_info *mtd)
-{
- struct platform_nand_data *pdata = dev_get_platdata(mtd->dev.parent);
-
- return pdata->ctrl.dev_ready(mtd_to_nand(mtd));
-}
-
/*
* Probe for the NAND device.
*/
@@ -70,10 +63,7 @@ static int plat_nand_probe(struct platform_device *pdev)
data->chip.IO_ADDR_R = data->io_base;
data->chip.IO_ADDR_W = data->io_base;
data->chip.cmd_ctrl = pdata->ctrl.cmd_ctrl;
-
- if (pdata->ctrl.dev_ready)
- data->chip.dev_ready = plat_nand_dev_ready;
-
+ data->chip.dev_ready = pdata->ctrl.dev_ready;
data->chip.select_chip = pdata->ctrl.select_chip;
data->chip.write_buf = pdata->ctrl.write_buf;
data->chip.read_buf = pdata->ctrl.read_buf;