arizona_poll_reg essentially hard-codes regmap_read_poll_timeout, this patch updates the implementation to use regmap_read_poll_timeout. We still keep arizona_poll_reg around as regmap_read_poll_timeout is a macro so rather than expand this for each caller keep it wrapped in arizona_poll_reg.
Signed-off-by: Charles Keepax <[email protected]> --- drivers/mfd/arizona-core.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 4cb34c3..e6fae3c 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -236,28 +236,22 @@ static irqreturn_t arizona_overclocked(int irq, void *data) } static int arizona_poll_reg(struct arizona *arizona, - int timeout, unsigned int reg, + int npolls, unsigned int reg, unsigned int mask, unsigned int target) { + const int poll_us = 7500; unsigned int val = 0; - int ret, i; - - for (i = 0; i < timeout; i++) { - ret = regmap_read(arizona->regmap, reg, &val); - if (ret != 0) { - dev_err(arizona->dev, "Failed to read reg 0x%x: %d\n", - reg, ret); - continue; - } - - if ((val & mask) == target) - return 0; + int ret; - usleep_range(1000, 5000); - } + ret = regmap_read_poll_timeout(arizona->regmap, + ARIZONA_INTERRUPT_RAW_STATUS_5, val, + ((val & mask) == target), poll_us, + npolls * poll_us); + if (ret) + dev_err(arizona->dev, "Polling reg 0x%x timed out: %x\n", + reg, val); - dev_err(arizona->dev, "Polling reg 0x%x timed out: %x\n", reg, val); - return -ETIMEDOUT; + return ret; } static int arizona_wait_for_boot(struct arizona *arizona) -- 2.1.4
