From nobody Fri May 3 11:52:42 2024 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 F1B12C433F5 for ; Fri, 30 Sep 2022 15:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230382AbiI3PQC (ORCPT ); Fri, 30 Sep 2022 11:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231760AbiI3PP4 (ORCPT ); Fri, 30 Sep 2022 11:15:56 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E4E1DF056 for ; Fri, 30 Sep 2022 08:15:55 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id g1-20020a17090a708100b00203c1c66ae3so4516774pjk.2 for ; Fri, 30 Sep 2022 08:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=bkGZlMCLcjGUMJh18RhP4Ctr01ZIOmKFkpG+F89/rcQ=; b=cybBlknOX9/DfQdo0Xe980ssg21Q5o50iv9PUSvznC2qYrzK2NumO347QdFKTRyOHM FY4hfsYNXFezlLbuarWagHuoz1s+oVb5jXi5mtBx5Hg9andKcny+jCAmaPHHIkYeJkPX Nk2/IL12+8PjMxfSxrf2YNtcvLyJHguO1qIMQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=bkGZlMCLcjGUMJh18RhP4Ctr01ZIOmKFkpG+F89/rcQ=; b=ze2C3v1HGOAbmJrAMN3SPeAlSQXl5NlOSQJfSvtJldQ3ltbuuvJrDl/OZP0W0QlYJF VyOrfz4nxuxB4IVlcCuLyjm2KyF+zVJApVPtNU8hBDFc4kZu3t8RUg9ETX+cMrnFlD7Q 3yi2HBY+RurDiuEp1DTMYyIv7Mc7GpR1/rub7btDUnTcypC6esLjB0yrfGgVRpD+U2hZ XQOkJNJp7gRwjbr/SdhirSWR+mcXUAVMXEgmW6KFEi8pBIF8BHJ7fTVQR5xdjPsxXlyt 5++lGNlubRvYqRzJQxvj99K1ahcoROVutHgjcnMkG8Vp1QbcxeDCxreMfK7PE9Ld3N4w W9rQ== X-Gm-Message-State: ACrzQf3BbUFbpRGTpIaZv+mENGEs/A6h3LDWRLknJPXcmO3WwmxSw+Cd qUvxWp+W4kfSIV1v+h41aQIRh2TeqeY7xA== X-Google-Smtp-Source: AMsMyM7dgX6KIprJugnpW4W2X/BhsVT0zR5F1NzXqlIHS4EK3Do0GsiexPC5q7UZws3YeTuk7VrkxQ== X-Received: by 2002:a17:90a:9b12:b0:203:9b0:284e with SMTP id f18-20020a17090a9b1200b0020309b0284emr10424274pjp.116.1664550954797; Fri, 30 Sep 2022 08:15:54 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id z3-20020aa79e43000000b0053b9e5d365bsm1894355pfq.216.2022.09.30.08.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:15:54 -0700 (PDT) From: Judy Hsiao To: Heiko Stuebner Cc: Liam Girdwood , Lin Huang , Elaine Zhang , Shunqian Zheng , Rob Herring , Brian Norris , Mark Brown , Jaroslav Kysela , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v1] ASoC: rockchip: i2s: use regmap_read_poll_timeout_atomic to poll I2S_CLR Date: Fri, 30 Sep 2022 15:15:46 +0000 Message-Id: <20220930151546.2017667-1-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 1. Uses regmap_read_poll_timeout_atomic to poll I2S_CLR as it is called within a spin lock. 2. Fixes the typo of break condition in regmap_read_poll_timeout_atomic. Fixes: fbb0ec656ee5 ("ASoC: rockchip: i2s: use regmap_read_poll_timeout to = poll I2S_CLR") Signed-off-by: Judy Hsiao --- sound/soc/rockchip/rockchip_i2s.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchi= p_i2s.c index 28c86f5e435e..a8758ad68442 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -162,12 +162,12 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s= , int on) I2S_CLR_TXC | I2S_CLR_RXC); if (ret < 0) goto end; - ret =3D regmap_read_poll_timeout(i2s->regmap, - I2S_CLR, - val, - val !=3D 0, - 20, - 200); + ret =3D regmap_read_poll_timeout_atomic(i2s->regmap, + I2S_CLR, + val, + val =3D=3D 0, + 20, + 200); if (ret < 0) dev_warn(i2s->dev, "fail to clear: %d\n", ret); } @@ -220,12 +220,12 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s= , int on) I2S_CLR_TXC | I2S_CLR_RXC); if (ret < 0) goto end; - ret =3D regmap_read_poll_timeout(i2s->regmap, - I2S_CLR, - val, - val !=3D 0, - 20, - 200); + ret =3D regmap_read_poll_timeout_atomic(i2s->regmap, + I2S_CLR, + val, + val =3D=3D 0, + 20, + 200); if (ret < 0) dev_warn(i2s->dev, "fail to clear: %d\n", ret); } --=20 2.38.0.rc1.362.ged0d419d3c-goog