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 C5499CD98E4 for ; Wed, 17 Jun 2026 10:37:09 +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=dYw5REkKxp624MWyS0jRryzwnCCP8XOG37PLDOHEuTk=; b=eii5GnISt8Mk+94ns0gVIlUcBC AChIPMh2ZFqNLgrvvLAmT9ecCnPOZZlruQOBgQtXDi0s8nWEbfTxIqjHR620hQoW3ECKfaRS/CNAW P8Y+YRKzscRd7AETxrm7yLt2nLBg5fWC6ZPJa0oi75wpupTyHcKPqNYqYTiimOZ3Vo7H64a8YsAx9 yIVWkyAtyHOhONo/DSOE3Xww+Jcr4zoypyNfcAaXubsJyfzKrYefnmeqO5nyXUiwx3GJNSKYnJ421 Tv3fkgmfd+lTT061YBRsglagIsdn89OS1VqNovDuYL4sM6x/VRfmdN4ReuMBpwyLxjK1aVXz3xy0V rpKsZwQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZndn-0000000H6eD-1b5f; Wed, 17 Jun 2026 10:37:03 +0000 Received: from mail-dy1-x132f.google.com ([2607:f8b0:4864:20::132f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZndk-0000000H6bP-027A for linux-arm-kernel@lists.infradead.org; Wed, 17 Jun 2026 10:37:02 +0000 Received: by mail-dy1-x132f.google.com with SMTP id 5a478bee46e88-3078e0dcd67so5791507eec.0 for ; Wed, 17 Jun 2026 03:36:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692619; x=1782297419; 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=dYw5REkKxp624MWyS0jRryzwnCCP8XOG37PLDOHEuTk=; b=e0zmS6jwrNpjWMX8IFNfELxhCBBlERxOPjgOyrlHjDP0trm7ESOimw/+SC5fLF8aau Dw8fDMLTfE720uMP3WHi2JkEMU3FhPDoXanDekUvIAgdmxn2okdUfBAotelITYL1+YJn onqnVayuXbrPrW9CuAV6gZZ3hRGKOerc0B5Zj8y/Kwg7bfKPm0Si+DvoaUZniBZFDPRB zjly+zqplkCKfMQlButgQgJpBx4t1hGJ8jaC5o/2lTeTjXJia7DiUf8YbMKsT4ByCgc5 7qINGPj/WryQidDX1p/lCBNw4K2qx7eHrmpoPHvrFFe7Uk6uCrV9gKy/Hm9WwxyPYrOH UMYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692619; x=1782297419; 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=dYw5REkKxp624MWyS0jRryzwnCCP8XOG37PLDOHEuTk=; b=e417iO3rwLebA6ZgNyZNKCxDUggE8agWXERQ9dmNXTZkWqKRyTJ7sxMNdyZCB+uDrC o+y/muMpZ+xMYaNubB3XIdsZZAzJa9uqks3hRj4czJkrPauCgQU49JgDZFKJvI4DDJHC dbaaZrd7VmCD3wi0ZdKCaFBfew2nXoU5LWbjsYZi0LYlNKYjY2VBLr7cQUYje86wev68 oSFU2+WaEhRFSsXWZf8Xw4v39axr/ZEBSU+/jJP6ATkAES6EI49h8xyXcO1eXyrV/NyG Glbg3V8mTQ2WZvwbKuV6BSMkn5MjKqEPZMLIeMNej6NtMf+/0t/KmUTJSH+7q6L96Zps BhdQ== X-Forwarded-Encrypted: i=1; AFNElJ/cuBgGmB3/6P39gLoK2SmDN3VZs7xWonoQGUO8LN1Dhfs4wQGZKu4ml4OB6zx+5jZpYFSZujhu7IDQSvcPaKMe@lists.infradead.org X-Gm-Message-State: AOJu0YxJaiSgusde9LGzFCaOj6cz3/z8h3iV8Jln8lMAusOvOnCcKV1r 8RVnp+shK/vRFqTg7Ue5g0g0pkE9D/QhWmy/h29Fo06vp1h2fdPG8+B6 X-Gm-Gg: AfdE7clMjw1iEuvj4m+HWjQygaakPuzcN48NTVMgvdZZfBSP/Bsu41eMI8yT1/iCYdg cHc7csf1cUqd6K0JtHN2dH6el8rklCWGmKXUAaUUd5RcWKIafy8xKRZTCX+V9AjyEBXThXTcSaP A/8LgP50Yvu/L+PsKOujf/xkxgefITTk3GQm+V+x2i2oKXpeGtxk/NmAcLLOmAw/xyP7ora1UzS 1SV6EC3deYi8qTDxHbtnJYjL0QxhpvS1w5m4PFvpnveYtFC23KIb3XaOaEUKGgn/2+0sE+I7pXo yuarWR0gJtmMrHcfDm1vDW+ev0sJ/dlo8xw1xnQ5EncfPi7oXhjO97HnC2ybLAZvI5hi3EbuO7n wCSnHc79Yua3JPUptfWkNjraxYMpzjNZZ7fJZ4+8urMdX/JDTHnNwgYoDodH4Z8DD4zQXhipmji qqtCNSJz46RcKmdjTYDYhowt+q+RVtw9IdzKUM72ix3nEDv4E= X-Received: by 2002:a05:7300:1481:b0:2ed:e14:42e9 with SMTP id 5a478bee46e88-30bca21d5d8mr1702825eec.34.1781692619223; Wed, 17 Jun 2026 03:36:59 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:36:58 -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 26/78] ASoC: codecs: da7219: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:43 +0700 Message-ID: <20260617103235.449609-27-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_033700_041640_91F2ABA4 X-CRM114-Status: GOOD ( 13.28 ) 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/da7219.c | 59 +++++++++++++-------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index f0874d891e12..171ee6346b2e 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -256,13 +256,10 @@ static int da7219_volsw_locked_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7219->ctrl_lock); - ret = snd_soc_get_volsw(kcontrol, ucontrol); - mutex_unlock(&da7219->ctrl_lock); + guard(mutex)(&da7219->ctrl_lock); - return ret; + return snd_soc_get_volsw(kcontrol, ucontrol); } static int da7219_volsw_locked_put(struct snd_kcontrol *kcontrol, @@ -270,13 +267,10 @@ static int da7219_volsw_locked_put(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7219->ctrl_lock); - ret = snd_soc_put_volsw(kcontrol, ucontrol); - mutex_unlock(&da7219->ctrl_lock); + guard(mutex)(&da7219->ctrl_lock); - return ret; + return snd_soc_put_volsw(kcontrol, ucontrol); } static int da7219_enum_locked_get(struct snd_kcontrol *kcontrol, @@ -284,13 +278,10 @@ static int da7219_enum_locked_get(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7219->ctrl_lock); - ret = snd_soc_get_enum_double(kcontrol, ucontrol); - mutex_unlock(&da7219->ctrl_lock); + guard(mutex)(&da7219->ctrl_lock); - return ret; + return snd_soc_get_enum_double(kcontrol, ucontrol); } static int da7219_enum_locked_put(struct snd_kcontrol *kcontrol, @@ -298,13 +289,10 @@ static int da7219_enum_locked_put(struct snd_kcontrol *kcontrol, { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); - int ret; - mutex_lock(&da7219->ctrl_lock); - ret = snd_soc_put_enum_double(kcontrol, ucontrol); - mutex_unlock(&da7219->ctrl_lock); + guard(mutex)(&da7219->ctrl_lock); - return ret; + return snd_soc_put_enum_double(kcontrol, ucontrol); } /* ALC */ @@ -422,9 +410,8 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol, __le16 val; int ret; - mutex_lock(&da7219->ctrl_lock); - ret = regmap_raw_read(da7219->regmap, reg, &val, sizeof(val)); - mutex_unlock(&da7219->ctrl_lock); + scoped_guard(mutex, &da7219->ctrl_lock) + ret = regmap_raw_read(da7219->regmap, reg, &val, sizeof(val)); if (ret) return ret; @@ -456,12 +443,12 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol, */ val_new = cpu_to_le16(ucontrol->value.integer.value[0]); - mutex_lock(&da7219->ctrl_lock); - ret = regmap_raw_read(da7219->regmap, reg, &val_old, sizeof(val_old)); - if (ret == 0 && (val_old != val_new)) - ret = regmap_raw_write(da7219->regmap, reg, - &val_new, sizeof(val_new)); - mutex_unlock(&da7219->ctrl_lock); + scoped_guard(mutex, &da7219->ctrl_lock) { + ret = regmap_raw_read(da7219->regmap, reg, &val_old, sizeof(val_old)); + if (ret == 0 && (val_old != val_new)) + ret = regmap_raw_write(da7219->regmap, reg, + &val_new, sizeof(val_new)); + } if (ret < 0) return ret; @@ -1167,15 +1154,12 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); int ret = 0; - mutex_lock(&da7219->pll_lock); + guard(mutex)(&da7219->pll_lock); - if ((da7219->clk_src == clk_id) && (da7219->mclk_rate == freq)) { - mutex_unlock(&da7219->pll_lock); + if ((da7219->clk_src == clk_id) && (da7219->mclk_rate == freq)) return 0; - } if ((freq < 2000000) || (freq > 54000000)) { - mutex_unlock(&da7219->pll_lock); dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", freq); return -EINVAL; @@ -1193,7 +1177,6 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, break; default: dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id); - mutex_unlock(&da7219->pll_lock); return -EINVAL; } @@ -1205,15 +1188,12 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, if (ret) { dev_err(codec_dai->dev, "Failed to set clock rate %d\n", freq); - mutex_unlock(&da7219->pll_lock); return ret; } } da7219->mclk_rate = freq; - mutex_unlock(&da7219->pll_lock); - return 0; } @@ -1298,9 +1278,8 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); int ret; - mutex_lock(&da7219->pll_lock); + guard(mutex)(&da7219->pll_lock); ret = da7219_set_pll(component, source, fout); - mutex_unlock(&da7219->pll_lock); return ret; } -- 2.43.0