diff options
| author | Boris Brezillon <boris.brezillon@bootlin.com> | 2018-07-27 09:44:17 +0200 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-09-04 22:24:55 +0200 |
| commit | 85e08e5864458b2e5e25defe2601bd835a42912c (patch) | |
| tree | 8a6b4e5e336bac0bc5c7953e6a4e8900a1ecbb07 | |
| parent | 57361846b52bc686112da6ca5368d11210796804 (diff) | |
| download | linux-stable-85e08e5864458b2e5e25defe2601bd835a42912c.tar.gz linux-stable-85e08e5864458b2e5e25defe2601bd835a42912c.tar.bz2 linux-stable-85e08e5864458b2e5e25defe2601bd835a42912c.zip | |
mtd: rawnand: Add the nand_wait_readrdy() helper and use it
The logic to wait for chip readiness after a page read has been
duplicated in nand_do_read_ops() and nand_do_read_oob(). Provide an
helper that does the right thing and call it where appropriate.
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index d527e448ce19..21a04b7b918c 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -3524,6 +3524,18 @@ static int nand_setup_read_retry(struct mtd_info *mtd, int retry_mode) return chip->setup_read_retry(mtd, retry_mode); } +static void nand_wait_readrdy(struct nand_chip *chip) +{ + if (!(chip->options & NAND_NEED_READRDY)) + return; + + /* Apply delay or wait for ready/busy pin */ + if (!chip->dev_ready) + udelay(chip->chip_delay); + else + nand_wait_ready(nand_to_mtd(chip)); +} + /** * nand_do_read_ops - [INTERN] Read data with ECC * @mtd: MTD device structure @@ -3631,13 +3643,7 @@ read_retry: } } - if (chip->options & NAND_NEED_READRDY) { - /* Apply delay or wait for ready/busy pin */ - if (!chip->dev_ready) - udelay(chip->chip_delay); - else - nand_wait_ready(mtd); - } + nand_wait_readrdy(chip); if (mtd->ecc_stats.failed - ecc_failures) { if (retry_mode + 1 < chip->read_retries) { @@ -3908,13 +3914,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from, len = min(len, readlen); buf = nand_transfer_oob(mtd, buf, ops, len); - if (chip->options & NAND_NEED_READRDY) { - /* Apply delay or wait for ready/busy pin */ - if (!chip->dev_ready) - udelay(chip->chip_delay); - else - nand_wait_ready(mtd); - } + nand_wait_readrdy(chip); max_bitflips = max_t(unsigned int, max_bitflips, ret); |