p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mtd: nand: sunxi: make use of readl_poll_timeout() 

Replace open coded polling loops by readl_poll_timeout() calls.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Boris Brezillon 2016-03-07 15:25:17 +01:00
parent a9a416f0c7
commit 166f08c7b6
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/mtd/nand/sunxi_nand.c
View File

@ -38,7 +38,7 @@
#include <linux/dmaengine.h> #include <linux/dmaengine.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/iopoll.h>
#define NFC_REG_CTL 0x0000 #define NFC_REG_CTL 0x0000
#define NFC_REG_ST 0x0004 #define NFC_REG_ST 0x0004
@ -322,33 +322,33 @@ static int sunxi_nfc_wait_int(struct sunxi_nfc *nfc, u32 flags,
static int sunxi_nfc_wait_cmd_fifo_empty(struct sunxi_nfc *nfc) static int sunxi_nfc_wait_cmd_fifo_empty(struct sunxi_nfc *nfc)
{ {
unsigned long timeout = jiffies + u32 status;
msecs_to_jiffies(NFC_DEFAULT_TIMEOUT_MS); int ret;
do { ret = readl_poll_timeout(nfc->regs + NFC_REG_ST, status,
if (!(readl(nfc->regs + NFC_REG_ST) & NFC_CMD_FIFO_STATUS)) !(status & NFC_CMD_FIFO_STATUS), 1,
return 0; NFC_DEFAULT_TIMEOUT_MS * 1000);
} while (time_before(jiffies, timeout)); if (ret)
dev_err(nfc->dev, "wait for empty cmd FIFO timedout\n");
dev_err(nfc->dev, "wait for empty cmd FIFO timedout\n"); return ret;
return -ETIMEDOUT;
} }
static int sunxi_nfc_rst(struct sunxi_nfc *nfc) static int sunxi_nfc_rst(struct sunxi_nfc *nfc)
{ {
unsigned long timeout = jiffies + u32 ctl;
msecs_to_jiffies(NFC_DEFAULT_TIMEOUT_MS); int ret;
writel(0, nfc->regs + NFC_REG_ECC_CTL); writel(0, nfc->regs + NFC_REG_ECC_CTL);
writel(NFC_RESET, nfc->regs + NFC_REG_CTL); writel(NFC_RESET, nfc->regs + NFC_REG_CTL);
do { ret = readl_poll_timeout(nfc->regs + NFC_REG_CTL, ctl,
if (!(readl(nfc->regs + NFC_REG_CTL) & NFC_RESET)) !(ctl & NFC_RESET), 1,
return 0; NFC_DEFAULT_TIMEOUT_MS * 1000);
} while (time_before(jiffies, timeout)); if (ret)
dev_err(nfc->dev, "wait for NAND controller reset timedout\n");
dev_err(nfc->dev, "wait for NAND controller reset timedout\n"); return ret;
return -ETIMEDOUT;
} }
static int sunxi_nfc_dev_ready(struct mtd_info *mtd) static int sunxi_nfc_dev_ready(struct mtd_info *mtd)