summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/raw/nand_base.c
diff options
context:
space:
mode:
authorBoris Brezillon2018-09-06 14:05:16 +0200
committerMiquel Raynal2018-10-03 11:12:25 +0200
commit2b356ab46ebe9b1bc63bda6708b81c9200382e78 (patch)
tree826ec9ad77388408ee6d7adbedf184efc9de4c5e /drivers/mtd/nand/raw/nand_base.c
parentmtd: rawnand: Pass a nand_chip object to nand_release() (diff)
downloadkernel-qcow2-linux-2b356ab46ebe9b1bc63bda6708b81c9200382e78.tar.gz
kernel-qcow2-linux-2b356ab46ebe9b1bc63bda6708b81c9200382e78.tar.xz
kernel-qcow2-linux-2b356ab46ebe9b1bc63bda6708b81c9200382e78.zip
mtd: rawnand: Pass a nand_chip object to nand_wait_ready()
Let's make the raw NAND API consistent by patching all helpers to take a nand_chip object instead of an mtd_info one. Now is nand_wait_ready()'s turn. 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/nand_base.c')
-rw-r--r--drivers/mtd/nand/raw/nand_base.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index f937efe145af..9d684f1d9e26 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -624,13 +624,13 @@ static void panic_nand_wait_ready(struct mtd_info *mtd, unsigned long timeo)
/**
* nand_wait_ready - [GENERIC] Wait for the ready pin after commands.
- * @mtd: MTD device structure
+ * @chip: NAND chip object
*
* Wait for the ready pin after a command, and warn if a timeout occurs.
*/
-void nand_wait_ready(struct mtd_info *mtd)
+void nand_wait_ready(struct nand_chip *chip)
{
- struct nand_chip *chip = mtd_to_nand(mtd);
+ struct mtd_info *mtd = nand_to_mtd(chip);
unsigned long timeo = 400;
if (in_interrupt() || oops_in_progress)
@@ -852,7 +852,7 @@ static void nand_command(struct mtd_info *mtd, unsigned int command,
*/
ndelay(100);
- nand_wait_ready(mtd);
+ nand_wait_ready(chip);
}
static void nand_ccs_delay(struct nand_chip *chip)
@@ -1004,7 +1004,7 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
*/
ndelay(100);
- nand_wait_ready(mtd);
+ nand_wait_ready(chip);
}
/**
@@ -2251,7 +2251,7 @@ static int nand_wait_rdy_op(struct nand_chip *chip, unsigned int timeout_ms,
if (!chip->dev_ready)
udelay(chip->chip_delay);
else
- nand_wait_ready(nand_to_mtd(chip));
+ nand_wait_ready(chip);
return 0;
}