aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/raw/plat_nand.c
diff options
context:
space:
mode:
authorBoris Brezillon2018-09-06 14:05:22 +0200
committerMiquel Raynal2018-10-03 11:12:25 +0200
commit7e534323c416216e8ac45b5633fb0a5e5137e5b5 (patch)
treec768a726e4ac39da87b976c532146d0eafd4757f /drivers/mtd/nand/raw/plat_nand.c
parent767eb6fbdedb7d8b9c7a87d640a8bc8091eba002 (diff)
mtd: rawnand: Pass a nand_chip object to chip->read_xxx() hooks
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 all chip->read_xxx() hooks at once. 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.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mtd/nand/raw/plat_nand.c b/drivers/mtd/nand/raw/plat_nand.c
index 80e1a44f0465..5193806923ba 100644
--- a/drivers/mtd/nand/raw/plat_nand.c
+++ b/drivers/mtd/nand/raw/plat_nand.c
@@ -52,13 +52,6 @@ static void plat_nand_write_buf(struct mtd_info *mtd, const uint8_t *buf,
pdata->ctrl.write_buf(mtd_to_nand(mtd), buf, len);
}
-static void plat_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
-{
- struct platform_nand_data *pdata = dev_get_platdata(mtd->dev.parent);
-
- pdata->ctrl.read_buf(mtd_to_nand(mtd), buf, len);
-}
-
/*
* Probe for the NAND device.
*/
@@ -111,9 +104,7 @@ static int plat_nand_probe(struct platform_device *pdev)
if (pdata->ctrl.write_buf)
data->chip.write_buf = plat_nand_write_buf;
- if (pdata->ctrl.read_buf)
- data->chip.read_buf = plat_nand_read_buf;
-
+ data->chip.read_buf = pdata->ctrl.read_buf;
data->chip.chip_delay = pdata->chip.chip_delay;
data->chip.options |= pdata->chip.options;
data->chip.bbt_options |= pdata->chip.bbt_options;