From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21E25CD6E4A for ; Wed, 3 Jun 2026 03:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TEBgbFdEMrwR0Bbx/xOW9IyMneCSJBVo6qr7YB9TYfA=; b=HeWActFyWZUCTokBN63lDT+NT7 GKrAjebV094e445H10cFBzTx6YjhSZZZF26c7pnrl5ImNRQncD00C4UkVJoL4akaEF/h9HHuAN5IK 3v/1B5+1J+9yvCrDvLbvc47/Xgk+YExU4AEbv+XK4JMNv7EPtryhcI7Si+2p9+nfWdW7dEVDIMJZX CEyc5I1aEYgQMdxUD9rNg2hw4bfmgPnyXsGUlIFflpKZ9Ri2I/pqMw0GOFXtrnyUrH38rjxSpqrJB yLaJoqz4zxCqs6e6oB9CNQzyBINnE5+paKxQW2gjlNB9kVGs4QOkUAKkpkxBvZ+Lc2DIEuswoy4hX P86XBG9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wUckc-0000000EDkj-05JR; Wed, 03 Jun 2026 03:58:42 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wUcka-0000000EDjU-0dFb for linux-arm-kernel@lists.infradead.org; Wed, 03 Jun 2026 03:58:41 +0000 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2bf0ddaf50fso35754575ad.1 for ; Tue, 02 Jun 2026 20:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780459119; x=1781063919; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TEBgbFdEMrwR0Bbx/xOW9IyMneCSJBVo6qr7YB9TYfA=; b=mHR6iwLEvAHTSoSBMkrxjeyEFzSARl7U4ePkLZstJ0PalSbwlhb9+ZaLGxDvNtENwB /YSF9zO0/ZJaRFkfalbaMCXIqC+CTVsQ8r7gnxsNf8S7Oowd1p8xcY6y/CL3SG+9e5Na Wz6okp4HBobrSa/GCtWYWavYVHtOgLK4HHzwc1lmkLRsu8mgSeU6rGAHx8dcVv28NXh9 1GH1WDO8RZ2x8UOdkDKslOztCBADb/kQjejs2ZhalOwR6GXzbCyaHclMIthOUmW+J6z7 L24wNBB1I3s4TK9v8G3kHWFYjIHDdnqeF/1BJ4rn9LsU4gnV+BpLyUhlm+JZUdgSMSZY pfyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780459119; x=1781063919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TEBgbFdEMrwR0Bbx/xOW9IyMneCSJBVo6qr7YB9TYfA=; b=KcO1JsqotFLi0RgedlWvJ21IuhChdn7quPtujAo9whNYnJvZdtHw+BXqlCXzg9e8A8 BqMNd19jfp8QyARlRHoWi3g1picIBPalyavEmsXGX91wdk4ZY7OfYrLoNJyFdqsHuYRx wsNazxABJD9dZrUqWPYzRHX99CAyxNP8em4KLfk8VkmcJxA+0b4Rz6j4z8WO0VQ0+j9H oypQy6sOpuZv2G1Bc7zmx9dFuFw/RGIKisRcR+VsSnu85M8x47xgswrqw9mTJDATzqQd CgsGTNCc4t2ZD3ikAs8CRLfOSwIYCmwOcYTb03qupMuN02qeJDBOVdoWCm66hK7zIUyz /skA== X-Forwarded-Encrypted: i=1; AFNElJ/SRATti1bs/BZDbtubzNFfNCWpGxuhgkEiQzULgRPjvJIi1zZNxSkwXeBG6Ouqi+6fOKAWa4SQgrf6YurXMfBU@lists.infradead.org X-Gm-Message-State: AOJu0YxKM9AmQp/aSbKaME9wcmdezQiJ3by0eTQXpCmYLO4i5WU8PwLh lnNs2SvwfveeH8WCi68Xf5P/rAXO5Ow3LOAPuIHdHmD8y5Hl1hEUKd5fwDt6vA== X-Gm-Gg: Acq92OGwzONpgjLr1+kRXRuvKsoiy3O7I6Kk6ussbRjiRTMkKslcP7UQsm3je/yeonl zBWwZTMwClS81UoRKNp37yNMo2axdFO1g3TwGA2KjnYx/QzLZlwJa3hY77GfpoCdce8Nga57Uhb lThtUNnk/XxAADTG0u0f8I/f/B/7IcZ7ncmF+36rVwmvqznkhy6HCKg5AsZSDJTSxJcJRC0D8Y3 /ytAjCN39HNM2vZ1O3EN/fL5Qil0GpHzN1KWoPJUnO97LGTyq4gQ6O+OCUCJTyPhuJ5BtCcuWe7 PnCzSloocfjqgP2/2NcE2H0XkMM8IO9iMfQT3BTHuhlg7OumM3rXAl4ibmKuj9SBtTc8IMvcLUp ymNjDDxBD5xAeW0GYxKolw+mI36NW3hbiQtWu6toAF6Qm4kbQ9BgWe6tOIhqDyP6RWfcq51Yxxt gIRb/Jnqq6NU26O8cn/otXOp+idsd/fWwdOg1JjFn6UntRSoSte65e5cYouaiC5PQOkFgP X-Received: by 2002:a17:903:90c:b0:2bf:305a:310d with SMTP id d9443c01a7336-2c163d86b55mr16757265ad.24.1780459119038; Tue, 02 Jun 2026 20:58:39 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f6e294sm8461085ad.6.2026.06.02.20.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:58:38 -0700 (PDT) From: phucduc.bui@gmail.com To: Heiko Stuebner , Mark Brown , Liam Girdwood Cc: Nicolas Frattaroli , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 1/3] ASoC: rockchip: rockchip_i2s: Use guard() for spin locks Date: Wed, 3 Jun 2026 10:57:39 +0700 Message-ID: <20260603035741.68893-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260603035741.68893-1-phucduc.bui@gmail.com> References: <20260603035741.68893-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260602_205840_209622_8B3FE4AD X-CRM114-Status: GOOD ( 15.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- NOTE: This patch is compile-tested only. sound/soc/rockchip/rockchip_i2s.c | 160 +++++++++++++++--------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 0a0a95b4f520..5a5087f4ae03 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -127,52 +127,52 @@ static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) unsigned int val = 0; int ret = 0; - spin_lock(&i2s->lock); - if (on) { - ret = regmap_update_bits(i2s->regmap, I2S_DMACR, - I2S_DMACR_TDE_ENABLE, - I2S_DMACR_TDE_ENABLE); - if (ret < 0) - goto end; - ret = regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_START | I2S_XFER_RXS_START); - if (ret < 0) - goto end; - i2s->tx_start = true; - } else { - i2s->tx_start = false; - - ret = regmap_update_bits(i2s->regmap, I2S_DMACR, - I2S_DMACR_TDE_ENABLE, - I2S_DMACR_TDE_DISABLE); - if (ret < 0) - goto end; - - if (!i2s->rx_start) { + scoped_guard(spinlock, &i2s->lock) { + if (on) { + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_TDE_ENABLE, + I2S_DMACR_TDE_ENABLE); + if (ret < 0) + break; ret = regmap_update_bits(i2s->regmap, I2S_XFER, I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_STOP | I2S_XFER_RXS_STOP); + I2S_XFER_TXS_START | I2S_XFER_RXS_START); if (ret < 0) - goto end; - udelay(150); - ret = regmap_update_bits(i2s->regmap, I2S_CLR, - I2S_CLR_TXC | I2S_CLR_RXC, - I2S_CLR_TXC | I2S_CLR_RXC); - if (ret < 0) - goto end; - ret = regmap_read_poll_timeout_atomic(i2s->regmap, - I2S_CLR, - val, - val == 0, - 20, - 200); + break; + i2s->tx_start = true; + } else { + i2s->tx_start = false; + + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_TDE_ENABLE, + I2S_DMACR_TDE_DISABLE); if (ret < 0) - dev_warn(i2s->dev, "fail to clear: %d\n", ret); + break; + + if (!i2s->rx_start) { + ret = regmap_update_bits(i2s->regmap, I2S_XFER, + I2S_XFER_TXS_START | I2S_XFER_RXS_START, + I2S_XFER_TXS_STOP | I2S_XFER_RXS_STOP); + if (ret < 0) + break; + udelay(150); + ret = regmap_update_bits(i2s->regmap, I2S_CLR, + I2S_CLR_TXC | I2S_CLR_RXC, + I2S_CLR_TXC | I2S_CLR_RXC); + if (ret < 0) + break; + ret = regmap_read_poll_timeout_atomic(i2s->regmap, + I2S_CLR, + val, + val == 0, + 20, + 200); + if (ret < 0) + dev_warn(i2s->dev, "fail to clear: %d\n", ret); + } } } -end: - spin_unlock(&i2s->lock); + if (ret < 0) dev_err(i2s->dev, "lrclk update failed\n"); @@ -184,53 +184,53 @@ static int rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) unsigned int val = 0; int ret = 0; - spin_lock(&i2s->lock); - if (on) { - ret = regmap_update_bits(i2s->regmap, I2S_DMACR, - I2S_DMACR_RDE_ENABLE, - I2S_DMACR_RDE_ENABLE); - if (ret < 0) - goto end; - - ret = regmap_update_bits(i2s->regmap, I2S_XFER, - I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_START | I2S_XFER_RXS_START); - if (ret < 0) - goto end; - i2s->rx_start = true; - } else { - i2s->rx_start = false; - - ret = regmap_update_bits(i2s->regmap, I2S_DMACR, - I2S_DMACR_RDE_ENABLE, - I2S_DMACR_RDE_DISABLE); - if (ret < 0) - goto end; + scoped_guard(spinlock, &i2s->lock) { + if (on) { + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_RDE_ENABLE, + I2S_DMACR_RDE_ENABLE); + if (ret < 0) + break; - if (!i2s->tx_start) { ret = regmap_update_bits(i2s->regmap, I2S_XFER, I2S_XFER_TXS_START | I2S_XFER_RXS_START, - I2S_XFER_TXS_STOP | I2S_XFER_RXS_STOP); + I2S_XFER_TXS_START | I2S_XFER_RXS_START); if (ret < 0) - goto end; - udelay(150); - ret = regmap_update_bits(i2s->regmap, I2S_CLR, - I2S_CLR_TXC | I2S_CLR_RXC, - I2S_CLR_TXC | I2S_CLR_RXC); - if (ret < 0) - goto end; - ret = regmap_read_poll_timeout_atomic(i2s->regmap, - I2S_CLR, - val, - val == 0, - 20, - 200); + break; + i2s->rx_start = true; + } else { + i2s->rx_start = false; + + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, + I2S_DMACR_RDE_ENABLE, + I2S_DMACR_RDE_DISABLE); if (ret < 0) - dev_warn(i2s->dev, "fail to clear: %d\n", ret); + break; + + if (!i2s->tx_start) { + ret = regmap_update_bits(i2s->regmap, I2S_XFER, + I2S_XFER_TXS_START | I2S_XFER_RXS_START, + I2S_XFER_TXS_STOP | I2S_XFER_RXS_STOP); + if (ret < 0) + break; + udelay(150); + ret = regmap_update_bits(i2s->regmap, I2S_CLR, + I2S_CLR_TXC | I2S_CLR_RXC, + I2S_CLR_TXC | I2S_CLR_RXC); + if (ret < 0) + break; + ret = regmap_read_poll_timeout_atomic(i2s->regmap, + I2S_CLR, + val, + val == 0, + 20, + 200); + if (ret < 0) + dev_warn(i2s->dev, "fail to clear: %d\n", ret); + } } } -end: - spin_unlock(&i2s->lock); + if (ret < 0) dev_err(i2s->dev, "lrclk update failed\n"); -- 2.43.0