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 E794ACD98E2 for ; Wed, 17 Jun 2026 10:36:53 +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=wEB/nJ+GbrXBchfLjo1ox4ZcZZOi5T3WM30Mb+CUID8=; b=vYvOyTcGOqaZw6AAAQFGE0iSuQ 2IccId436dz24UFSzn166Rop4E35VezILh+2pAsIEgPHcvXXF67mo0lXfKRlEQguu+iJE4BdBDyVY V6QTSOT/WG2NhQ7bLKHACYvuvDK6e+l5xfP3UPYrqILgiPHcgSAcsVpmlja5Ag95faamRKxpxrIYy wvI/DKeKo1wWMPgV4e3rZeFTxOn3EUmHXJXKlkQRDcP1fkoTRhVXHa0GfEFjmVv+/JtBmTQA7Rrz4 SfcO298YaF3mfdWZ6yaOJyktNyicf50RiT8vT3AtjRaTMhC3Qx/GZCr+GG5wIytRVF07Tq0n2GKRE CLn1CSZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZndd-0000000H6WL-0gC6; Wed, 17 Jun 2026 10:36:53 +0000 Received: from mail-dy1-x132b.google.com ([2607:f8b0:4864:20::132b]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnda-0000000H6U9-3TMw for linux-mediatek@lists.infradead.org; Wed, 17 Jun 2026 10:36:52 +0000 Received: by mail-dy1-x132b.google.com with SMTP id 5a478bee46e88-30be4a661aeso103885eec.0 for ; Wed, 17 Jun 2026 03:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692610; x=1782297410; 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=wEB/nJ+GbrXBchfLjo1ox4ZcZZOi5T3WM30Mb+CUID8=; b=hwUx4xGvsRiLBtFPFKT5wNXrQFTQBB8hg+5Eo3Hx+uYbfhfeyM4YLwTxpS89HhTF+c UGkd5yshNBcgb2ZyiU1baFsHLZrAv/ttTSqmLofSxWqBnEhAxU7TYToEBPo/7wiAUlzE cPdtVVvjAwy/aKyO7IBLHTTsWfWazzjxUn5i+xLufGPRAoB/dpqsDe8hrZTsdxuKZWjS Ek/h8dVySvLBG3ulNkUEBBn94wlo/apA2PAC5T9LEMLm7Mr8R1fIxx/X7A0TwpACsVzf kiWPW9J+kzxxW6uTRKv982mLVIbDbpErdRypno03ODwGPk238d58ZS6zg1i9e4JNVDgU c0ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692610; x=1782297410; 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=wEB/nJ+GbrXBchfLjo1ox4ZcZZOi5T3WM30Mb+CUID8=; b=ZanOpB/lxPXKxVCavNLZ7YYjB0NSVO40CwtA1mLHwQi6MHzxkFgN/dWil0ysOb1QBK M0DM1UdeWElWurgiIQLPybXZ/wYD966kmVyF/4cPPdaosIRV1FKx+x3J6NGGLNy6bCix QvHbJ/1WizDwuWNN08pSZWFLmWUuVS+g4HE2k9MyXIS0mOILetuzvqqwkXTUWoBT6zbL +v1dp+DEklH3IW1OdRtK8S4IcKIzQVW14lPnyhOKHnvnoZLZouDMlObrjH6/BTFNk5VI qunDPJZFCuM5etGuwG/Ia7/ufI0EpdncQeIk9hkugRbsR23LxrexOqk3b3my7gi0SIGR N7YQ== X-Forwarded-Encrypted: i=1; AFNElJ/ibmY6+jvCwF9VNONgta8YT7eW0czssPck0eE8Cv11eVIXNKGbAbff1vC42nfLjFuuANBtLkQ/kfrF8AaHMw==@lists.infradead.org X-Gm-Message-State: AOJu0Yy+IMeCvhEYrq9+nwGQA/XR4olw0NpwuC/gvmbsnJCiFvkDktJS JYSiitSFHjyvR8cK/OYejTlu+RiIgglxWOzu5AeP9xBur8TUQvwMxJGV X-Gm-Gg: AfdE7cncs9eX0uvh50yCi+1tYJth1gGQZ/MAnRH54oqAyXew0GVoHiQgeofsLVaGnCw hZpVSD5IjGiCOL5zIuLHabr7jpkZihoNHbISH3lQvFd8brXsn+p8S46EJxNTzdx0tUGhzcqe8Ty VRlesuuvjfZcNc0m8Iwb8u7Y3e0VjAXJiEq+Y9M0aDg0LEi+xEbSUIdcoR7VpZCL17oQIwiw12/ U0zYUB1NFa721Qy8iu6YVPT3BUrWld/+Cljvu6czc5ixVgL9J9+tipmDr4zvTAokG2yhz0P9kYP 9bveQX8pc1hPVpQW3XPE64ATTzBk/A0NAve6l5OKn4OHPwgaJVjvnstUX9aSwcp10EI/T6JIKtc HS0qKGI+BeRbBXJlRdYgoMvPoaUbEsaUxKMRTbGdhuB83sgt/y7Z4tKgtWrjxtDczmS0ZGnBoIz DENPy5huV538On+atGKl6k9kkXzKG1mUo7LVviDvjfV4e0S5A= X-Received: by 2002:a05:7301:3c0a:b0:307:6e47:f881 with SMTP id 5a478bee46e88-30bc9f3aa8dmr1695525eec.16.1781692610135; Wed, 17 Jun 2026 03:36:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:36:49 -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 25/78] ASoC: codecs: da7213: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:42 +0700 Message-ID: <20260617103235.449609-26-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_033650_872996_6DDAE76E X-CRM114-Status: GOOD ( 11.12 ) 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/da7213.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 4bf91ab2553a..384c79c7b5c0 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -216,13 +216,10 @@ static int da7213_volsw_locked_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7213->ctrl_lock); - ret = snd_soc_get_volsw(kcontrol, ucontrol); - mutex_unlock(&da7213->ctrl_lock); + guard(mutex)(&da7213->ctrl_lock); - return ret; + return snd_soc_get_volsw(kcontrol, ucontrol); } static int da7213_volsw_locked_put(struct snd_kcontrol *kcontrol, @@ -230,13 +227,10 @@ static int da7213_volsw_locked_put(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7213->ctrl_lock); - ret = snd_soc_put_volsw(kcontrol, ucontrol); - mutex_unlock(&da7213->ctrl_lock); + guard(mutex)(&da7213->ctrl_lock); - return ret; + return snd_soc_put_volsw(kcontrol, ucontrol); } static int da7213_enum_locked_get(struct snd_kcontrol *kcontrol, @@ -244,13 +238,10 @@ static int da7213_enum_locked_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7213->ctrl_lock); - ret = snd_soc_get_enum_double(kcontrol, ucontrol); - mutex_unlock(&da7213->ctrl_lock); + guard(mutex)(&da7213->ctrl_lock); - return ret; + return snd_soc_get_enum_double(kcontrol, ucontrol); } static int da7213_enum_locked_put(struct snd_kcontrol *kcontrol, @@ -258,13 +249,10 @@ static int da7213_enum_locked_put(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7213->ctrl_lock); - ret = snd_soc_put_enum_double(kcontrol, ucontrol); - mutex_unlock(&da7213->ctrl_lock); + guard(mutex)(&da7213->ctrl_lock); - return ret; + return snd_soc_put_enum_double(kcontrol, ucontrol); } /* ALC */ @@ -465,9 +453,8 @@ static int da7213_tonegen_freq_get(struct snd_kcontrol *kcontrol, __le16 val; int ret; - mutex_lock(&da7213->ctrl_lock); - ret = regmap_raw_read(da7213->regmap, reg, &val, sizeof(val)); - mutex_unlock(&da7213->ctrl_lock); + scoped_guard(mutex, &da7213->ctrl_lock) + ret = regmap_raw_read(da7213->regmap, reg, &val, sizeof(val)); if (ret) return ret; @@ -499,12 +486,11 @@ static int da7213_tonegen_freq_put(struct snd_kcontrol *kcontrol, */ val_new = cpu_to_le16(ucontrol->value.integer.value[0]); - mutex_lock(&da7213->ctrl_lock); + guard(mutex)(&da7213->ctrl_lock); ret = regmap_raw_read(da7213->regmap, reg, &val_old, sizeof(val_old)); if (ret == 0 && (val_old != val_new)) ret = regmap_raw_write(da7213->regmap, reg, &val_new, sizeof(val_new)); - mutex_unlock(&da7213->ctrl_lock); if (ret < 0) return ret; -- 2.43.0