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 24098CD98E4 for ; Wed, 17 Jun 2026 10:39:32 +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=4V8d0Yg4cyesbpB3rX5XFizQgFDCgrflJrinbH7M1Rc=; b=sSVVPrYJd/Up/Y7CtkbGjkl3F1 bRXvRM4YMyPO76qdZIuuuZSL0w2yydlV5nmJgccO0TtoaPph+oc20Nb2bwesL2VIlqCdcmkp/MBFs 79iGYUinTtJ1A3JsEpqjUY3LKKSqXHjSEo4fR/uYKM1k8OfKCoZ36TCV4t0J3IQcjmv9vWS/7C4cm sCVW+v0becF58BvjFsIhUr0qH8mAz3WL3r/3S/WTbC2Bu5EZA1YEO/u0uDcvqeKRRXTlpQSLjZhU2 JjoBwOWRPS06vRLIifXM/v11e3jMcDLQuzqxriLUSVuxoZKQMahvRoO3oAwH5qpow/s6Z0dHtsgb8 7ilyX3jA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZngB-0000000H8YP-117b; Wed, 17 Jun 2026 10:39:31 +0000 Received: from mail-dy1-x1335.google.com ([2607:f8b0:4864:20::1335]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZng8-0000000H8WL-3Wl2 for linux-mediatek@lists.infradead.org; Wed, 17 Jun 2026 10:39:29 +0000 Received: by mail-dy1-x1335.google.com with SMTP id 5a478bee46e88-30bc806fcf8so1069618eec.1 for ; Wed, 17 Jun 2026 03:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692768; x=1782297568; 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=4V8d0Yg4cyesbpB3rX5XFizQgFDCgrflJrinbH7M1Rc=; b=NTRLz68ZZ9n3hhxEU83dNxsAH7abGJEnymjAbgrWSdvjjU0SS4VCyoxRjp+BF1QQhH H1vw1JbVQhTCOYQHh4etlfP7ljs+WHyQIw0Sv2c4jEqvTCrJpAGyxaCnuJDlDdbFAjWe ggrjUt+RzA6fySWwdwCZJWDiI2IESyJC6BEB+S1Q7zahtyDjzVNh+RazBaDhbx66m8lG fE+NguZrGKP6P5IEKXO0XcdyXJSFqHV9otnwFLQ8Ysl4eRzTWm4TXBZyEfaB/9WbfYhR qImjc6Np4GIPVZmHoT6bIqo4I4dT5q002svOU++qnea7uSjQ4gHZoJU6d8n8gtNMXbq6 mdKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692768; x=1782297568; 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=4V8d0Yg4cyesbpB3rX5XFizQgFDCgrflJrinbH7M1Rc=; b=XlOJQSAo1GU6sbkFabskkLtFwIwt4SNAK01BFu6itt12tdkIAi1CMPeBOAd/i1rReE RXVDG4exxQvwYKCd/KJBu8tPD4NZtYaluWS/pvGILl6GDL3lIrFwU9ynZoFVdlrn04T2 TkTr7zHqdIQRJP6S3Az+sH9UJ4l6EGWo8FlAlmRKwNhGjyVNyR4EDPMNNkTaGZwHI8te ReTFaD09ZkuhNbIEQIpVXG7JLXHwPLVEyvm+P9j4GUegMrBaU088/bUq/fRLwJNpMzHa sYqchJteYunnvaZRJQtvbYiulx+HAJyucImE6ibGhoyyuht5xtd8jDlXXw8UEFRYqa4H d5rw== X-Forwarded-Encrypted: i=1; AFNElJ/9uWkzhAK6ABngWIYu7UntS6IQXHAW7pqHL0565h36QS1kzfwS1L5SdFqP2/2h4d3EirCggygce5WC/RLygg==@lists.infradead.org X-Gm-Message-State: AOJu0YzPn+iT1af65GZtCfQsnac3y1IZpLIsPf9yOOdfoQZBU6BYbSjl JrWMzKG+QXwjfNSRndoF0rTlzoTaRHjNofljM7kkIstZS9L920BWbxl9 X-Gm-Gg: AfdE7clSqWsY2R9I0bmceehB8i/YyYmGF8qoNc/T2bsVfBAoCYH15VMuaBr6iqjA/4T I/jDux8Hxicpxc8ptb3gRWFSWMIk6qtaXjBodRAMHjgA8eNAb2528G3kwjF6wq35LneZRGwMwON EP589yRX2EGDZt/iPy9odt8VS7PtSQKcUQvc4umnZHVq70vXTCXY851olhmc4ep5psI1jfPOtA9 2Fgd/xCMTYV5wOqdtT4X7K5ClCiAydnEmhSocHNG15jDEmlGgdirBEcM1dwCjZejLu/ysEa59JK hhkmaN7U7d7vt7nYUQ4MUNFS9YO+Y/I43vN2/7BT7slbXTKRS3SYXkhO/nC1Dclaf70A6Pn62wS 2zzu5BFkTywdmCMakU4wnL3RL4539Gn6NkWPguLnvMQsPrLHm1n20ZIUc6JSmG6oSglRHopa5vF nVzhj9BOEiaHNAGKwbQ0BMMTuuBj88irTUb/tOer7r73Pa/jM= X-Received: by 2002:a05:7300:2d20:b0:304:d835:274 with SMTP id 5a478bee46e88-30bcae227f9mr1625563eec.24.1781692768114; Wed, 17 Jun 2026 03:39:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:39:27 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 41/78] ASoC: codecs: rt5514-spi: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:58 +0700 Message-ID: <20260617103235.449609-42-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-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-20260617_033928_885760_20740F23 X-CRM114-Status: GOOD ( 10.66 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/rt5514-spi.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 199507d12841..be4f5f7da22e 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -79,17 +79,17 @@ static void rt5514_spi_copy_work(struct work_struct *work) unsigned int cur_wp, remain_data; u8 buf[8]; - mutex_lock(&rt5514_dsp->dma_lock); + guard(mutex)(&rt5514_dsp->dma_lock); if (!rt5514_dsp->substream) { dev_err(rt5514_dsp->dev, "No pcm substream\n"); - goto done; + return; } runtime = rt5514_dsp->substream->runtime; period_bytes = snd_pcm_lib_period_bytes(rt5514_dsp->substream); if (!period_bytes) { schedule_delayed_work(&rt5514_dsp->copy_work, 5); - goto done; + return; } if (rt5514_dsp->buf_size % period_bytes) @@ -111,7 +111,7 @@ static void rt5514_spi_copy_work(struct work_struct *work) if (remain_data < period_bytes) { schedule_delayed_work(&rt5514_dsp->copy_work, 5); - goto done; + return; } } @@ -146,9 +146,6 @@ static void rt5514_spi_copy_work(struct work_struct *work) snd_pcm_period_elapsed(rt5514_dsp->substream); schedule_delayed_work(&rt5514_dsp->copy_work, 5); - -done: - mutex_unlock(&rt5514_dsp->dma_lock); } static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp) @@ -216,7 +213,7 @@ static int rt5514_spi_hw_params(struct snd_soc_component *component, snd_soc_component_get_drvdata(component); u8 buf[8]; - mutex_lock(&rt5514_dsp->dma_lock); + guard(mutex)(&rt5514_dsp->dma_lock); rt5514_dsp->substream = substream; rt5514_dsp->dma_offset = 0; @@ -225,8 +222,6 @@ static int rt5514_spi_hw_params(struct snd_soc_component *component, if (buf[0] & RT5514_IRQ_STATUS_BIT) rt5514_schedule_copy(rt5514_dsp); - mutex_unlock(&rt5514_dsp->dma_lock); - return 0; } @@ -236,9 +231,8 @@ static int rt5514_spi_hw_free(struct snd_soc_component *component, struct rt5514_dsp *rt5514_dsp = snd_soc_component_get_drvdata(component); - mutex_lock(&rt5514_dsp->dma_lock); - rt5514_dsp->substream = NULL; - mutex_unlock(&rt5514_dsp->dma_lock); + scoped_guard(mutex, &rt5514_dsp->dma_lock) + rt5514_dsp->substream = NULL; cancel_delayed_work_sync(&rt5514_dsp->copy_work); -- 2.43.0