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>
This commit is contained in:

committed by
Miquel Raynal

parent
767eb6fbde
commit
7e534323c4
@@ -135,16 +135,16 @@ static int tango_dev_ready(struct mtd_info *mtd)
|
||||
return readl_relaxed(nfc->pbus_base + PBUS_CS_CTRL) & PBUS_IORDY;
|
||||
}
|
||||
|
||||
static u8 tango_read_byte(struct mtd_info *mtd)
|
||||
static u8 tango_read_byte(struct nand_chip *chip)
|
||||
{
|
||||
struct tango_chip *tchip = to_tango_chip(mtd_to_nand(mtd));
|
||||
struct tango_chip *tchip = to_tango_chip(chip);
|
||||
|
||||
return readb_relaxed(tchip->base + PBUS_DATA);
|
||||
}
|
||||
|
||||
static void tango_read_buf(struct mtd_info *mtd, u8 *buf, int len)
|
||||
static void tango_read_buf(struct nand_chip *chip, u8 *buf, int len)
|
||||
{
|
||||
struct tango_chip *tchip = to_tango_chip(mtd_to_nand(mtd));
|
||||
struct tango_chip *tchip = to_tango_chip(chip);
|
||||
|
||||
ioread8_rep(tchip->base + PBUS_DATA, buf, len);
|
||||
}
|
||||
@@ -325,15 +325,13 @@ static int tango_write_page(struct nand_chip *chip, const u8 *buf,
|
||||
|
||||
static void aux_read(struct nand_chip *chip, u8 **buf, int len, int *pos)
|
||||
{
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
|
||||
*pos += len;
|
||||
|
||||
if (!*buf) {
|
||||
/* skip over "len" bytes */
|
||||
nand_change_read_column_op(chip, *pos, NULL, 0, false);
|
||||
} else {
|
||||
tango_read_buf(mtd, *buf, len);
|
||||
tango_read_buf(chip, *buf, len);
|
||||
*buf += len;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user