From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29AAE367F3A for ; Tue, 30 Jun 2026 06:35:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801326; cv=none; b=rLoFaXRR9vdBFH6KlIB6j6j7Fb2qLajeiEvp6guS8qP3H2gSwL4t+CH3W+KSTLjIOAE6pV64pLrkipg5dWAk89GwVjLjgDuRKHgRkVINZF9zL/f2v92K5DBEaBHcL5lPhDT8i4MB6Yo9UB/mMJJ402JqP2p4HhLmqCNmg981d44= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801326; c=relaxed/simple; bh=VXhKHHn9ZGwsz2BBhKT+WqePWKagL9CFfeB24cowb3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hNPyi47N7bJQKxarAAgLP2r+0Kv/2Z3LZU2qLPRd51Q+8vZ5RzA8CM4z92nxpYnRoRfeqBfpWD1I9N81jju3hkhcqBat3MGu5/l2dX1z1g3qeWNVlW5FyrYPnl39GfaX02n0mtvUdeF9+qiqtm7JEayJJ3EefR88ymlEva9OchM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VX959knD; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VX959knD" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8478fe07f0fso1247444b3a.0 for ; Mon, 29 Jun 2026 23:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801322; x=1783406122; darn=vger.kernel.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=0N/pTidBzJ8Ptc9uwX4OWE7axc8TdvYboPnbco8nYNo=; b=VX959knDvXuT8wlo0qIF7KgX8e/d6D8OyinTCKkDRqWKUPVrdt3MfHd/iAPK2WCsSW q5KLclx2pd2Q9/QYcOOiW5CSU5BgO3xkLS+jZ+aZ8tp7IYvPpuZFij2T3qm0QYBHgyTq s53aor4Zsqsf7p5NuIKwXLLoP2rvkEqWBJiZfPsoBP9GPKtJCdflzXJQo0B7bSTzOUXP VcidATGofgj0NYyYum7eBhUjAN1xtw07oQHAhMlfjzm2/MBTC61Igtcnp/NXubvI2rnr MUU9Nxw99A5+cpjEqsVDe4ZPtWMlthz/m8MFOfHfqHfHEkU2p+elV94EzvysQTLj1eJy +AuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801322; x=1783406122; 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=0N/pTidBzJ8Ptc9uwX4OWE7axc8TdvYboPnbco8nYNo=; b=RyNFGazft6ZOBwmP/uOrtjH6pRS7JfnAGzQii4VaiNnwl6gYZr1GtVZBNlYGXmJZuC 5XG3euyBZhMq2Gnhu/De2C/FrJB6IAyySfyFkYM+KdYI5sa9KOWbeSGM59wVMFUMVTZl rAYJ6Qt0Jke6hLHsV9AEYYvqhF62n+IftnKvx/RS+0H513KPY7j7dRDroB83EYtuE24N 06EAcwiqEAyp+LmwQmwi1+M+PpVX6E3iPuZ4CrkPnzfWlgCfrpAOV/THuZzJh+tOoTg6 WFtOsaNDPz/AB8SRGilE30yEvlcpcYFPpjHbGyL0yukFUsngWPCzC2wxhKVwsV2zpprF 4k7Q== X-Forwarded-Encrypted: i=1; AHgh+RpyPUGMi+dfKrmz1a1fUyrz5+gyLXqyiuRCemJv9ADqVoQa6H+rHZCLoiyva627/LCzojTntkM1lkVcKxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzfZ0UBnsupH8P47vmYzySIwWRu16P6kbVJk3LGqKlr5I3jqbIk /HsXp/b13jvPeAGpX+JzWZ6fJiLYBmGUYZA37NgGIguYItFkKFvaEnPK X-Gm-Gg: AfdE7ckUEsEuTUeFM0OMWZx7tTWL8cYL7qKw0sDhsZDJyJLXdz2ihVAse1XFORSDQyg rhb086WXcNQ9nMQp6+Ylur0B5GU98qAQgfPazP63X+X8K4qZKKF1fvUi6TxrP8/rTiEomqauA0t sHYICOWOlZ5uKDPPRExjp4XRa643fCg36WKthKEv8AT8BLNBO3PvXFaVHFkaZTTDQVHHhiVpOVp eY+6Ag66pn7KQRA0qbrWN5WRKLeY/GTmRPEPMgRbhlV8+ykJhuykvK7JyjGi9Z4qZbD3OBu6xvM mQ0NZHozE4VSZgmGjd3iYObVkKpNNihY/lVMvrTAO6hkDdbUBM1NWltRiP0cporflT/b8ibtKfX TUNT9eTar89QO0mgyHGoGYTE3KXB0F17po12QguYWzTXCRseOnIMyu89Ti+FRwjuBKXbKk4o7yj BVMEdibx6Fk5rzjmkMJnU5Uo9ocWCwBqccEWnIlPMchj2LMCg= X-Received: by 2002:a05:6a00:b481:b0:847:8496:1aa2 with SMTP id d2e1a72fcca58-8479f1702f7mr1952682b3a.27.1782801322126; Mon, 29 Jun 2026 23:35:22 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:35:21 -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 02/27] ASoC: codecs: da7219: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:24 +0700 Message-ID: <20260630063449.503996-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 | 55 ++++++++++++--------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index f0874d891e12..915b1d3b05ff 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -256,13 +257,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 +268,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 +279,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 +290,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 +411,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 +444,11 @@ 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); + 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)); - mutex_unlock(&da7219->ctrl_lock); + &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); + if (freq < 2000000 || freq > 54000000) { 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