From nobody Tue Dec 30 08:04:31 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6454AC5AE4B for ; Fri, 17 Nov 2023 15:41:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346141AbjKQPlO (ORCPT ); Fri, 17 Nov 2023 10:41:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346152AbjKQPk6 (ORCPT ); Fri, 17 Nov 2023 10:40:58 -0500 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1088819A9 for ; Fri, 17 Nov 2023 07:40:43 -0800 (PST) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 3AH8U57Q031440; Fri, 17 Nov 2023 09:40:41 -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=j Mxjx8uYfygMEBvu13m8vNG/QwpnvhsuVDVBW53JuLQ=; b=NFND+pwkfQaGCHEDg hEL3kuAwf0maHl/alm6givWDqRrHHsC+8tsASAjAL3frbGHu8/dqTj5JDp5vJCtk ucWawa/gUoNS+oTrWWF27Io6Kjn3s8AeNcZ12jf9IfDSo36FKlJyiH94OY0j7neZ 2GiENXm/O7YnWPtQXernuM8e9GDEzH470hI/76gFH8pZRIgfqbfvVAfDRLnig++l vzpfEBwSd/jbrRL5iXTbzfjWnZZODTUX0JMiWCFX5GbmVEGo/CduHbRtqPH3Jq0f TdNpgNHvj6eELiSx127YbnEEpohbbQCU/6rs6JpYthbvDTZfnhScSFX34Iwq5Tbo TjdSA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3ua7w2qnn9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Nov 2023 09:40:41 -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; Fri, 17 Nov 2023 15:40:39 +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; Fri, 17 Nov 2023 15:40:39 +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 690F815B9; Fri, 17 Nov 2023 15:40:39 +0000 (UTC) From: Maciej Strozek To: Lee Jones CC: , , "Maciej Strozek" Subject: [PATCH] mfd: wm831x: Remove redundant forever while loop Date: Fri, 17 Nov 2023 15:40:37 +0000 Message-ID: <20231117154037.67676-1-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: Zz1A7v9YFHpkHZtSVefFpphCyF_5_8Hp X-Proofpoint-GUID: Zz1A7v9YFHpkHZtSVefFpphCyF_5_8Hp X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Acked-by: Charles Keepax --- drivers/mfd/wm831x-auxadc.c | 46 +++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/mfd/wm831x-auxadc.c b/drivers/mfd/wm831x-auxadc.c index 65b98f3fbd92..49f0ffd68d47 100644 --- a/drivers/mfd/wm831x-auxadc.c +++ b/drivers/mfd/wm831x-auxadc.c @@ -179,32 +179,28 @@ static int wm831x_auxadc_read_polled(struct wm831x *w= m831x, goto disable; } =20 - /* If we're not using interrupts then poll the - * interrupt status register */ - timeout =3D 5; - while (timeout) { - msleep(1); - - ret =3D wm831x_reg_read(wm831x, - WM831X_INTERRUPT_STATUS_1); - if (ret < 0) { - dev_err(wm831x->dev, - "ISR 1 read failed: %d\n", ret); - goto disable; - } + /* If we're not using interrupts then read the + * interrupt status register + */ + msleep(20); + ret =3D wm831x_reg_read(wm831x, + WM831X_INTERRUPT_STATUS_1); + if (ret < 0) { + dev_err(wm831x->dev, + "ISR 1 read failed: %d\n", ret); + goto disable; + } =20 - /* 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 =3D -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 =3D -EBUSY; + goto disable; } =20 ret =3D wm831x_reg_read(wm831x, WM831X_AUXADC_DATA); --=20 2.34.1