From patchwork Wed Nov 29 13:28:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Strozek X-Patchwork-Id: 171347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp335880vqn; Wed, 29 Nov 2023 05:28:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBCp8cI0o1k9YVZ6ZoA1NLVF+Eev/7k0W/veQlde/Iqf6JyOpqAUa8CtTbpyG/UgIHGP5Y X-Received: by 2002:a05:6a00:2e06:b0:6c2:cb9a:885e with SMTP id fc6-20020a056a002e0600b006c2cb9a885emr18954412pfb.15.1701264512832; Wed, 29 Nov 2023 05:28:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701264512; cv=none; d=google.com; s=arc-20160816; b=fpIqmPFf0hP+/2fBalNy11rwfyh0UtG1MTx+cOt7N9jzCtKditDauPLdMJbvr6SrxJ qi74ce1/17oj7idT5zM0kqJK7FKEVIGui6XSRIwxH12BU6EJMK8wUDxDkb4sm1Zmzpl4 PgU663kf8Tvyak14SIAiBblTkbEKe+UexRBNnXPSyf/E0x9JsFBNEg1ZBlqz2+HkOs1y ZMNt5YQV6xuv2UQ8NXaOtbwJH2APP0iLuYi92ONhlUOMD92Po3tU6d/FdGgezU0ZIj/O 6dy0CD9U3N7+aDdMNrSdWIgUnXUllx+ohBx3fzxc7bjUdyYFRg1iPECQIQu29jH2NO6b qXtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=imd3WMe5eVrNHtfWcnGWTRuiNO0ihLgfVPUsvAMiNfo=; fh=LYuJYGf9YNBY7QtU4l6y1MQLI+egsdpqtFlsxQi1uB8=; b=rAvyQrhG9RelGDOMaRuxXvxSq8hkp7QwkKPsuZllnyBW/4BAXfqbziYChdolWznozE LivIoJaoV1cY9dQU+zWjFOqePpChLL60nBe4muqOqsKLbbj5h/yZaQV05LZSHFhkrBxn +LldfjmGgKwlfxsIF0psNPCcmEkcw0mOBYsg9fA0V0zettJT3o76U50c732vkxilVwpT bLRV593kfBQ4mTUcl3zXQ7HdErMd9oUDGhorZ8eBu6hYqpBLVWhfqLgi6EgAt6oq5TjF jo8zxPIhaSAuiR0pXR0tff+OXcOMFoDw4iWz41LODmA3ITQO3EAFAX0w9RY+3CZpmnLg w3UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=HUzvop2w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id p1-20020a056a000a0100b006bdaa24308fsi14711246pfh.105.2023.11.29.05.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 05:28:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=HUzvop2w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id ED06D805A910; Wed, 29 Nov 2023 05:28:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231138AbjK2N2S (ORCPT + 99 others); Wed, 29 Nov 2023 08:28:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230437AbjK2N2R (ORCPT ); Wed, 29 Nov 2023 08:28:17 -0500 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50C359D for ; Wed, 29 Nov 2023 05:28:23 -0800 (PST) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3AT7ot2n005547; Wed, 29 Nov 2023 07:28:20 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=i md3WMe5eVrNHtfWcnGWTRuiNO0ihLgfVPUsvAMiNfo=; b=HUzvop2wlHgiYXToP JsKsj67bzYWWs8yoTiUfA/+vR7wTPvqftPXnF0JAJ6QTPtL5aNEZbqihPA1+kC6q cAbBOnps4d23rhf07CkKCslhtrTbnvwzg4+AUi4fufAQrxA2oRg3xzKtTt0y/9jT 5/iTYzLnuNcsCutxC2BVyQFYtqcO9+/C21tQOIWCqDpbBevdYuOLK8r3RmLYsZ31 00w0o0A1YjkBntvACzAPR5PMyLm4nOsGouup/o60KL55hw/DEGErGItOt0MkXwuZ k4jULhq3MrtmkL6PKpeBGpjOOKIIFfcEjIDTpk2bUPDCUL/7qOaNKiPxCWidGiGf h+jhA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3unvprrfty-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 Nov 2023 07:28:19 -0600 (CST) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 29 Nov 2023 13:28:18 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.39 via Frontend Transport; Wed, 29 Nov 2023 13:28:18 +0000 Received: from upx-tgl-008-ubuntu.ad.cirrus.com (upx-tgl-008-ubuntu.ad.cirrus.com [198.90.251.167]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4371415A5; Wed, 29 Nov 2023 13:28:18 +0000 (UTC) From: Maciej Strozek To: Lee Jones CC: , , "Maciej Strozek" Subject: [PATCH v3] mfd: wm831x: Remove redundant forever while loop Date: Wed, 29 Nov 2023 13:28:16 +0000 Message-ID: <20231129132816.15620-1-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: W-c20O3bmvwF7aVyemND64M72jypcTV7 X-Proofpoint-GUID: W-c20O3bmvwF7aVyemND64M72jypcTV7 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 29 Nov 2023 05:28:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783905137543126965 X-GMAIL-MSGID: 1783905137543126965 Current code excutes only once despite the while loop, so remove the loop. Also msleep(1) will likely result in a larger sleep, so increase its value for clarity while keeping the same behaviour. Signed-off-by: Maciej Strozek --- V2 -> V3: formatting changes: fixed a comment and 2 line-ups, added a new line V1 -> V2: removed unused variable 'timeout' drivers/mfd/wm831x-auxadc.c | 43 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 25 deletions(-) -- 2.34.1 diff --git a/drivers/mfd/wm831x-auxadc.c b/drivers/mfd/wm831x-auxadc.c index 65b98f3fbd92..18618a8f9206 100644 --- a/drivers/mfd/wm831x-auxadc.c +++ b/drivers/mfd/wm831x-auxadc.c @@ -152,7 +152,7 @@ static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data) static int wm831x_auxadc_read_polled(struct wm831x *wm831x, enum wm831x_auxadc input) { - int ret, src, timeout; + int ret, src; mutex_lock(&wm831x->auxadc_lock); @@ -179,32 +179,25 @@ static int wm831x_auxadc_read_polled(struct wm831x *wm831x, goto disable; } - /* If we're not using interrupts then poll the - * interrupt status register */ - timeout = 5; - while (timeout) { - msleep(1); + /* If we're not using interrupts then read the interrupt status register */ + msleep(20); - ret = wm831x_reg_read(wm831x, - WM831X_INTERRUPT_STATUS_1); - if (ret < 0) { - dev_err(wm831x->dev, - "ISR 1 read failed: %d\n", ret); - goto disable; - } + ret = wm831x_reg_read(wm831x, WM831X_INTERRUPT_STATUS_1); + if (ret < 0) { + dev_err(wm831x->dev, + "ISR 1 read failed: %d\n", ret); + goto disable; + } - /* Did it complete? */ - if (ret & WM831X_AUXADC_DATA_EINT) { - wm831x_reg_write(wm831x, - WM831X_INTERRUPT_STATUS_1, - WM831X_AUXADC_DATA_EINT); - break; - } else { - dev_err(wm831x->dev, - "AUXADC conversion timeout\n"); - ret = -EBUSY; - goto disable; - } + /* Did it complete? */ + if (ret & WM831X_AUXADC_DATA_EINT) { + wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1, + WM831X_AUXADC_DATA_EINT); + } else { + dev_err(wm831x->dev, + "AUXADC conversion timeout\n"); + ret = -EBUSY; + goto disable; } ret = wm831x_reg_read(wm831x, WM831X_AUXADC_DATA);