Commit a9a416f0 authored by Boris Brezillon's avatar Boris Brezillon

mtd: nand: sunxi: fix ->dev_ready() implementation

->dev_ready() is not supposed to wait for busy to ready solution (this is
the role of ->waitfunc()).
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 336de7b1
...@@ -357,7 +357,6 @@ static int sunxi_nfc_dev_ready(struct mtd_info *mtd) ...@@ -357,7 +357,6 @@ static int sunxi_nfc_dev_ready(struct mtd_info *mtd)
struct sunxi_nand_chip *sunxi_nand = to_sunxi_nand(nand); struct sunxi_nand_chip *sunxi_nand = to_sunxi_nand(nand);
struct sunxi_nfc *nfc = to_sunxi_nfc(sunxi_nand->nand.controller); struct sunxi_nfc *nfc = to_sunxi_nfc(sunxi_nand->nand.controller);
struct sunxi_nand_rb *rb; struct sunxi_nand_rb *rb;
unsigned long timeo = (sunxi_nand->nand.state == FL_ERASING ? 400 : 20);
int ret; int ret;
if (sunxi_nand->selected < 0) if (sunxi_nand->selected < 0)
...@@ -367,12 +366,6 @@ static int sunxi_nfc_dev_ready(struct mtd_info *mtd) ...@@ -367,12 +366,6 @@ static int sunxi_nfc_dev_ready(struct mtd_info *mtd)
switch (rb->type) { switch (rb->type) {
case RB_NATIVE: case RB_NATIVE:
ret = !!(readl(nfc->regs + NFC_REG_ST) &
NFC_RB_STATE(rb->info.nativeid));
if (ret)
break;
sunxi_nfc_wait_int(nfc, NFC_RB_B2R, timeo);
ret = !!(readl(nfc->regs + NFC_REG_ST) & ret = !!(readl(nfc->regs + NFC_REG_ST) &
NFC_RB_STATE(rb->info.nativeid)); NFC_RB_STATE(rb->info.nativeid));
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment