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 7F1D4C43458 for ; Tue, 30 Jun 2026 06:38:37 +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=5I542Atg1yY1laQM/jnE851nD9DT4YIfrvz5OV73CCc=; b=XPel4WSgT+T/jnKYEnwOZxlrWm lZIOndCzR6FQ4Q3DjTJhmuVS+GjRk/HYwKOjOTG01Al1RroAVbX1W3oD8P0UI4llM3vwPhgbKEb2u 2I3SztmSunS8r7LuB/p01IAzL0VXwqYUSTzer+I+WR3JFxi2Jlyr1MFBUa9LiGLs3l9q4NzAjxU9S gZ8mdZ1Y8DdWmKEORTmOzBinNiVRj7MyDgSs79bQrS42G0qK+LWujwKn2SP/pXql6psZeXYOT/uG8 0kBuorbWuL1liSQgd2FLWWj2vrODY5IS4KdWkiWCS1rYMGpF+S2JQmNKv9wtSLhWrjB6sw9Yuu8/i f6Wc2AoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS73-0000000G0QT-3dEY; Tue, 30 Jun 2026 06:38:29 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS71-0000000G0NV-3J3l for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Jun 2026 06:38:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5I542Atg1yY1laQM/jnE851nD9DT4YIfrvz5OV73CCc=; b=mJ8wdMLUS3c4Axzy+LOQsH/fv+ 7yQsUAQrFO5OOzbDcYib3FFKDkWcow6fNqBfCFXHdUFRzdHB1vI9FiaqjqmPjDY/ghmb8XjLA9CkG lD8JICLSO0SLu+eld5h5kabX319EURfjep0inRFw19ePDoweItgrKPQdYxcQLiaiqXgRx1AS1gJYs pWlAcZInYpcE0Ft2j8sETDezrngGaeKirW4+B+Hnac5zQAvyiyFEKfEUdsSOB3XtRxxbMhrBB+hWm 4uorN+ihDK37kN+ZAh/u/KfUEDTdvrsNjuxXD1cPvgwEFnXHMnMbDr5n4cECTZ3R0CESZzOvsuVNd JsZcGFnw==; Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1weS6r-00000001ZSO-0FMA for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2026 06:38:23 +0000 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-847a5528b33so119546b3a.3 for ; Mon, 29 Jun 2026 23:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801495; x=1783406295; 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:content-type; bh=5I542Atg1yY1laQM/jnE851nD9DT4YIfrvz5OV73CCc=; b=f2D487pRD9Ufg4Q6/6A0u1WOjmvQspe3lSADIkNW/1XMY7WBZJrJXsLHI+qj/dq9ic zwVbvKMqOklTkF4K/ufcrzikha/xBP0izVvWPgSXkPvya6jCq/3D2FQODtlRJXXXD5AG 3C3BUh969XWhJoqQ+ZcTXoEzHy/Cr2CnA27F7QRq9Kz4AofqQ8nnoJN/OYVpjfXT7+Dz SaSTa2wPfcn2vUynxTHp7lIHa2OwY+TMIqvxPchS3xnrA43Oyh/eSuRuu6/5I0ZmxaEu jCV22yF8nQE2ynEgRdTsQoki06s6KImfwfCsKo8HzippHVaIuyiuVVXcaKwnguNotPie G56g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801495; x=1783406295; 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:content-type; bh=5I542Atg1yY1laQM/jnE851nD9DT4YIfrvz5OV73CCc=; b=DFZfRtmr/StugnLzxBBRMGPeztunOzX5UvXMGHnPJVl510UgjF+PTc4IpFM+wfG55z NrXvMFOr09IljyqEMVbNZjefZOHAGQIDrtM5NYYCZmjuRC+++LH0rmwHwMoUfrhaMqAw xHjEXYrEEeVK/5ho4Naly8SERZtIMwIe6frWRpp9rpYiP35YqYJ7F/OVdz39g0H9mi1i uENZ+bAoaELXqWhopoPgnXpLYShHImgIbgEmiuWi3ZxUzYhHkwyakNNSHdqFkSuPuwIZ d6flNv/MMptC1gnAksHlB9zuQZb/6tq1Yd8nZonSSeqOQGpKTwe4a4SzvFbhayhn2JNU VXiQ== X-Forwarded-Encrypted: i=1; AFNElJ8p3/XEhDfH+NeTED4x+HtTYZOOiHk8Ju2PQCvKm+5yWmgB4fbaYxvXgzT3L4RsceogqgYs/oMG2T8V5KaNbUg2@lists.infradead.org X-Gm-Message-State: AOJu0Yyl+ZYqYaOhvJPt7yGVDhYacJQK9grbtR4s6o/bcKlHhlBw7u+n qc3u0n9+B5alP7q8nX5to/iReUKssW78Wk01oXjbaS1xH3wCZTmiyOis X-Gm-Gg: AfdE7cl8CSdshT9kEnFaLirZCllnxoQhAbGtgmjv9YOfNOzetfPift3ZD1Sy4iXaBsb dXE6/r/GAsk8dP/jccv4t1byvCahi1eUzixa04LD34nWrkLAMx4A4WwA1uwdIYzJmgmj73ct3oA ydgLahX2dWAYS1BQDCkNZJI8Nl+ypuU+9eiGO2LZOxP9ankJrtA7822cPvhVhGb4IbnkkR1ZX9u InGImLAmqq8Flv3B1Ih9Dk33qYGfRQT1cgiqjo+hYHJh36IKGajqTnNfzOD74AWH0ID/uwBEsbZ M954Qe5mB3C4+CKjAGP6p2p0XeMXnxDdKoSSjLas+ZNqEXHQj4/AbXghbq7KdKp5pjxTnF41ig0 HYBU6CpejeKMjTPL1SwCrV2Rth0RUurPKu3dLmSZSNWeNH7vpfaH0tcsVplggYW44KQ+qQ7m0CP vi1pVqqd5JPlT3nt+8ksSmYA9/M5NcB+x2V1AtxUPCIk9vvzY= X-Received: by 2002:a05:6a00:2191:b0:847:8dec:1427 with SMTP id d2e1a72fcca58-8479eed0d97mr1690509b3a.8.1782801495183; Mon, 29 Jun 2026 23:38:15 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:38:14 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH 22/27] ASoC: codecs: rt5682: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:44 +0700 Message-ID: <20260630063449.503996-23-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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-20260630_073819_820014_60F9E051 X-CRM114-Status: GOOD ( 16.34 ) 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 mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/rt5682-sdw.c | 24 ++++++++++++------------ sound/soc/codecs/rt5682.c | 5 ++--- sound/soc/codecs/rt5682s.c | 17 +++++------------ 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index dec8c2147d68..e7dc4f722fc1 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -6,6 +6,7 @@ // Author: Oder Chiou // +#include #include #include #include @@ -660,12 +661,11 @@ static int rt5682_interrupt_callback(struct sdw_slave *slave, dev_dbg(&slave->dev, "%s control_port_stat=%x", __func__, status->control_port); - mutex_lock(&rt5682->disable_irq_lock); + guard(mutex)(&rt5682->disable_irq_lock); if (status->control_port & 0x4 && !rt5682->disable_irq) { mod_delayed_work(system_power_efficient_wq, &rt5682->jack_detect_work, msecs_to_jiffies(rt5682->irq_work_delay_time)); } - mutex_unlock(&rt5682->disable_irq_lock); return 0; } @@ -736,11 +736,11 @@ static int rt5682_dev_system_suspend(struct device *dev) * deferred work completes and before the parent disables * interrupts on the link */ - mutex_lock(&rt5682->disable_irq_lock); - rt5682->disable_irq = true; - ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, - SDW_SCP_INT1_IMPL_DEF, 0); - mutex_unlock(&rt5682->disable_irq_lock); + scoped_guard(mutex, &rt5682->disable_irq_lock) { + rt5682->disable_irq = true; + ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, + SDW_SCP_INT1_IMPL_DEF, 0); + } if (ret < 0) { /* log but don't prevent suspend from happening */ @@ -760,12 +760,12 @@ static int rt5682_dev_resume(struct device *dev) return 0; if (!slave->unattach_request) { - mutex_lock(&rt5682->disable_irq_lock); - if (rt5682->disable_irq == true) { - sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); - rt5682->disable_irq = false; + scoped_guard(mutex, &rt5682->disable_irq_lock) { + if (rt5682->disable_irq) { + sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); + rt5682->disable_irq = false; + } } - mutex_unlock(&rt5682->disable_irq_lock); } ret = sdw_slave_wait_for_init(slave, RT5682_PROBE_TIMEOUT); diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 4b82e07d3b2c..6f7e68c20d13 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -6,6 +6,7 @@ // Author: Bard Liao // +#include #include #include #include @@ -3125,7 +3126,7 @@ void rt5682_calibrate(struct rt5682_priv *rt5682) { int value, count; - mutex_lock(&rt5682->calibrate_mutex); + guard(mutex)(&rt5682->calibrate_mutex); rt5682_reset(rt5682); regmap_write(rt5682->regmap, RT5682_I2C_CTRL, 0x000f); @@ -3175,8 +3176,6 @@ void rt5682_calibrate(struct rt5682_priv *rt5682) regmap_write(rt5682->regmap, RT5682_CALIB_ADC_CTRL, 0x2005); regmap_write(rt5682->regmap, RT5682_STO1_ADC_MIXER, 0xc0c4); regmap_write(rt5682->regmap, RT5682_CAL_REC, 0x0c0c); - - mutex_unlock(&rt5682->calibrate_mutex); } EXPORT_SYMBOL_GPL(rt5682_calibrate); diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 3624067950c0..34997cfb465b 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -6,6 +6,7 @@ // Author: Derek Fang // +#include #include #include #include @@ -648,7 +649,7 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int mode { struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component); - mutex_lock(&rt5682s->sar_mutex); + guard(mutex)(&rt5682s->sar_mutex); switch (mode) { case SAR_PWR_SAVING: @@ -695,8 +696,6 @@ static void rt5682s_sar_power_mode(struct snd_soc_component *component, int mode dev_err(component->dev, "Invalid SAR Power mode: %d\n", mode); break; } - - mutex_unlock(&rt5682s->sar_mutex); } static void rt5682s_enable_push_button_irq(struct snd_soc_component *component) @@ -2534,7 +2533,7 @@ static int rt5682s_wclk_prepare(struct clk_hw *hw) if (!rt5682s_clk_check(rt5682s)) return -EINVAL; - mutex_lock(&rt5682s->wclk_mutex); + guard(mutex)(&rt5682s->wclk_mutex); snd_soc_component_update_bits(component, RT5682S_PWR_ANLG_1, RT5682S_PWR_VREF2 | RT5682S_PWR_FV2 | RT5682S_PWR_MB, @@ -2556,8 +2555,6 @@ static int rt5682s_wclk_prepare(struct clk_hw *hw) rt5682s->wclk_enabled = 1; - mutex_unlock(&rt5682s->wclk_mutex); - return 0; } @@ -2570,7 +2567,7 @@ static void rt5682s_wclk_unprepare(struct clk_hw *hw) if (!rt5682s_clk_check(rt5682s)) return; - mutex_lock(&rt5682s->wclk_mutex); + guard(mutex)(&rt5682s->wclk_mutex); if (!rt5682s->jack_type) snd_soc_component_update_bits(component, RT5682S_PWR_ANLG_1, @@ -2585,8 +2582,6 @@ static void rt5682s_wclk_unprepare(struct clk_hw *hw) rt5682s_set_pllb_power(rt5682s, 0); rt5682s->wclk_enabled = 0; - - mutex_unlock(&rt5682s->wclk_mutex); } static unsigned long rt5682s_wclk_recalc_rate(struct clk_hw *hw, @@ -2997,7 +2992,7 @@ static void rt5682s_calibrate(struct rt5682s_priv *rt5682s) { unsigned int count, value; - mutex_lock(&rt5682s->calibrate_mutex); + guard(mutex)(&rt5682s->calibrate_mutex); regmap_write(rt5682s->regmap, RT5682S_PWR_ANLG_1, 0xaa80); usleep_range(15000, 20000); @@ -3034,8 +3029,6 @@ static void rt5682s_calibrate(struct rt5682s_priv *rt5682s) regmap_write(rt5682s->regmap, RT5682S_PWR_DIG_1, 0x00c0); regmap_write(rt5682s->regmap, RT5682S_PWR_ANLG_1, 0x0800); regmap_write(rt5682s->regmap, RT5682S_GLB_CLK, 0x0000); - - mutex_unlock(&rt5682s->calibrate_mutex); } static const struct regmap_config rt5682s_regmap = { -- 2.43.0