From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 2B77F3E866B for ; Tue, 30 Jun 2026 06:35:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801327; cv=none; b=DSb6Y8uMlNeMOTtBIaagQBRhSZlLJc2xzLZnCgyxPRqrjaA9Eor2MAbAoEVKzxayG3eWV40BjAfspVnvlpsIFMpjXQc++6PsMhVLHcXAYo+1WMsfDP+f/26K1Z5R+EAUn5jEs7A6wrN6WafbuOtIntA30YnXbPy/GJwBaRpxwi4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801327; c=relaxed/simple; bh=VXhKHHn9ZGwsz2BBhKT+WqePWKagL9CFfeB24cowb3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B9+auJzxWzjtjPIXRUgfiUh9piYmFruDMLjL3k9Jegw6r9KU4i7GqcEfc79eIbgk07NtCjoDAcalvj9IWDJu0rNz+djzxI1n4cHO54Vxphbp5ihzA0fTvy/yMULf4boHqgahlmtws1NG4vD2SH1oWDwUO3k4W2l8rEEUWHr7kYU= 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.171 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-f171.google.com with SMTP id d2e1a72fcca58-847968ca62fso920855b3a.2 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=LIECL5zu0kbxjC2jRw6RyjqcTKOETbPei4fLBlLWYVUY8y6cBd7SOeLbDCqps5Ea/F iqaxZK3Gm/qxnehsBEoqMdCi584oBHEh3iLD/mNkAl1sQnBhqA7/tSeDymoS+vMeIB9e mc8o3UbJTfib8kUNOvTjExmL5rkmyQkDVIk+o3V71wIQGhsb8vmWHk0agTDGQwsnFj1g 6K+dKZbXDDbe4eiyXJ8JtDIRMUDvUdYPOzlxIo9M1Y8jdA4xRgPJ9Oc1CAcTrG5NxCCG o1y0fUwvjxYNXjZEYynzRmyg0D/tMLM9pKEzzSJoiuze01ytZg9tF0/rL0HOoFHpjX3u T+eA== X-Forwarded-Encrypted: i=1; AHgh+Rqbq1chiDCL/ofhAr7N/OmWt3veKZwZqT+dlKGnfffoVO59EiLAMqkzMeVR0dyxhFzkwXbYBAgCKYBndCnn@vger.kernel.org X-Gm-Message-State: AOJu0YyUO/OriKLob7nXawPnjzENIVClYLphqZQqBYkE5uBgEoFMyezd HPJSkfOcOxFz56ZK9/I1DPtdnQMdtTIyVtI0fy+tFIvEnYwjKsre5bxA X-Gm-Gg: AfdE7cnBE1aYMyQN3XX9gJJclVFPJXvNPMaEhWM7BrjrdRuFtV11gOblgMfAPB2EiXT vFHqgD6Z1Jne4nm30Y21PW8wcwJ0HmXVfXyymGkWWvAD3JlL7yzhClWTJGw88u/Y9iUsJbmCdm8 PMpOROanpDBWNfA6FgFZGyXIE60qSN1cQsGHJwkWTlS+hVsm/jw7qhQtIPiXZKZt7TuIsLiOAs5 OMbQz0AYyl8h3lKb/cR7olV8NEhCrUqnALlHPqV/gEN9l/zYNfgbT/Sf0C1BWOZhfqfT+uBJy8i T/6z2ZBFiMW82jQOatBP+ieE5clYbRwM+x+cf0uSaONAnZUw4NXbNILgJzfJVriV68VQ9bphasJ s/Senlwj7keXLXseEPvRQxEh0ayKMRfuHskfa55pVsCnIMnbpkOgR3nYNdmHfMq7codE6xCS/Ls jqGurrGWFTvFhYti2ttrbdEb5czkFFmQlHjvXN/owN7nsOgLk= 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-arm-msm@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