From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751017AbdAaOnV (ORCPT ); Tue, 31 Jan 2017 09:43:21 -0500 Received: from mx0b-001ae601.pphosted.com ([67.231.152.168]:57976 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737AbdAaOnF (ORCPT ); Tue, 31 Jan 2017 09:43:05 -0500 Authentication-Results: ppops.net; spf=none smtp.mailfrom=ckeepax@opensource.wolfsonmicro.com From: Charles Keepax To: CC: , Subject: [PATCH RESEND 3/4] mfd: arizona: Update arizona_poll_reg to take a timeout in milliseconds Date: Tue, 31 Jan 2017 14:44:02 +0000 Message-ID: <1485873843-8491-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485873843-8491-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> References: <1485873843-8491-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1701310127 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, we specify the timeout in terms of the number of polls but it is more clear from a user of the functions perspective to specify the timeout directly in milliseconds, as such update the function to these new semantics. Signed-off-by: Charles Keepax --- drivers/mfd/arizona-core.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 4cb34c3..ae4cdc4 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -235,14 +235,18 @@ static irqreturn_t arizona_overclocked(int irq, void *data) return IRQ_HANDLED; } +#define ARIZONA_REG_POLL_DELAY_MS 5 + static int arizona_poll_reg(struct arizona *arizona, - int timeout, unsigned int reg, + int timeout_ms, unsigned int reg, unsigned int mask, unsigned int target) { + unsigned int npolls = (timeout_ms + ARIZONA_REG_POLL_DELAY_MS - 1) / + ARIZONA_REG_POLL_DELAY_MS; unsigned int val = 0; int ret, i; - for (i = 0; i < timeout; i++) { + for (i = 0; i < npolls; i++) { ret = regmap_read(arizona->regmap, reg, &val); if (ret != 0) { dev_err(arizona->dev, "Failed to read reg 0x%x: %d\n", @@ -253,7 +257,8 @@ static int arizona_poll_reg(struct arizona *arizona, if ((val & mask) == target) return 0; - usleep_range(1000, 5000); + usleep_range((ARIZONA_REG_POLL_DELAY_MS * 1000) / 2, + ARIZONA_REG_POLL_DELAY_MS * 1000); } dev_err(arizona->dev, "Polling reg 0x%x timed out: %x\n", reg, val); @@ -269,7 +274,7 @@ static int arizona_wait_for_boot(struct arizona *arizona) * we won't race with the interrupt handler as it'll be blocked on * runtime resume. */ - ret = arizona_poll_reg(arizona, 5, ARIZONA_INTERRUPT_RAW_STATUS_5, + ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5, ARIZONA_BOOT_DONE_STS, ARIZONA_BOOT_DONE_STS); if (!ret) @@ -339,7 +344,7 @@ static int arizona_enable_freerun_sysclk(struct arizona *arizona, ret); return ret; } - ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5, + ret = arizona_poll_reg(arizona, 125, ARIZONA_INTERRUPT_RAW_STATUS_5, ARIZONA_FLL1_CLOCK_OK_STS, ARIZONA_FLL1_CLOCK_OK_STS); if (ret) @@ -403,7 +408,7 @@ static int wm5102_apply_hardware_patch(struct arizona *arizona) goto err; } - ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1, + ret = arizona_poll_reg(arizona, 25, ARIZONA_WRITE_SEQUENCER_CTRL_1, ARIZONA_WSEQ_BUSY, 0); if (ret) regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0, -- 2.1.4