From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 4BC48472786 for ; Wed, 17 Jun 2026 10:37:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692627; cv=none; b=RA/KWpHkp9/62aMKVzz05AOsNwXqyggDzf3IiphmrBDFbUHT2g/DDzKKZiKNWpLv7wifAPRCPZuUYHrUD+NLssWLMPjvo4uAEeSsxQgiFrf4kOYAvgNBe97+Y4SLtUrLrLNY8xBeKGuiFL28geMp5VO143pIbSNYEQmA6U5piq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692627; c=relaxed/simple; bh=DOt3EGUqpXHD2f19fHf8exVet1GktAa+R4mDT7U7BeE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eA0qs42NW85K7bJKcQ8B62whZin9ra6QLmx8POEuSNdEcmfUTTemuSmuhotISuv0AF2e4fM3ElxjF8jOat71i6j683fJksbQINYWN11bOd3W0R3rtJ1M4OnSxY58FUxml3vSdsvSB53iCqnrX4Tuy8Q16ZAkkLb/22R6ye5Pwao= 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=Rp8zqpzx; arc=none smtp.client-ip=74.125.82.174 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="Rp8zqpzx" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-3078e0dcd67so5791504eec.0 for ; Wed, 17 Jun 2026 03:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692619; x=1782297419; 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=dYw5REkKxp624MWyS0jRryzwnCCP8XOG37PLDOHEuTk=; b=Rp8zqpzxt8GcTZnHe0iHd3Qhesz22ghLHPwiZGKCE4M4kTTcpQL550X1l5981Y718L tQrwexXnYBFUdsebXLdKMs4/Aj1jH7Lw1qMMxYucsF7MyXzuWS1RwpwKFodcW3yoOd9T WWbUwcW5Bi86U9fr/VSveb/xl3qwNe00JiAEioc0adSc6F+i2W/XGE762TNqgdaOgTRz mmg4VZnKFAMTJO/pGUNQ7WDKeeFTAN+Y5FrUtDqvqStsXXwF4bfivwqetJKf87bxhMjc qV2s4wRjgy+q4OLe9QUbaGbfQRIMLUv3Mcc/5XUEsidi90kFZWVC78dHJzYNDb2HZYER A7Kg== 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=FG21xJlPjwCxv0aVOvFj1Zp4AAqFQR8UwPb03YJ9jDO21bP5gv7AVsPYORpkfhZmB+ dyGo4fhSRTB052UHNcAZzgSVKiIBVuPIiJlNbOFYWTw32rB/XdW13ZKqoliKNa23MyNH Es9aXqyd1pWyTc4yAAuWzeW6RcxhGew7fZgRazHpq69+IjAEKnXufd9Sd6/My2v65wld vclThvR7YSfufj+GCOlqQiwKl620IMGn/afyNlZZW+vQO0jDMHRo2R07HVIvBDwfX5Gs Hlw8C9g/BpJoh7IxFd8PO4p8TUjXdW/9uFoslGGEPWjVFwrlRC6XIK1NIU/XKoYQXm5E KDVw== X-Forwarded-Encrypted: i=1; AFNElJ8yynD2SC5wQnEbqP37BL/0iMcdYFEEgv7me72wG+U4lAEONU/7aTVoTou63CDXK0+zJ0/C9QhS2fae6w==@vger.kernel.org X-Gm-Message-State: AOJu0YwUTzMiCKvxExfx2Sm2Jzl0fBaZCKF0x3WtP/fzj01V1CUtzomX SeEFnfEgnlY7YH1rzvdXC10/j8wazUg+iWxk2Ck5nQduGdJu67ryz3TF X-Gm-Gg: AfdE7clJs/CACTEkqYQdbevdYWfMNgK+ybjQQun3p+XcnF/XJyr0qiw0CP+dE/Oj3Vd X7bIjw49pe81QgyXnemEfDWKWxAUecVLzfKcuLTsHgci0M+vpceUhPXdvWwBmLE5Yk3s9L86NMP 8pXNtqkXZzFqLn3MjSufVvS/XOuzZUFcirZDhMZJj/EOH0LgLqpLylkpVaW39VhHA1V+GbAXNbI SbPVEDNf+1oFgzOhtqbTLPSxwhJDR+cpLd623bcj4SBb2L+7AoUYEWaSJTRSZ2zDr2c8cbU+Ks5 2SJ7qwqisQI85e55zWlBsBl8qDRJb0dGpLw4eIhN1t5QPVpkPWjN6M53B265vYAbSMEAL25VmpN xWi+jBNyMiADl8pOdq4lywLlLO6vI3FTXnD+BjFyK/ukd6aqlnXzJ+YP2XW1MPvs2Pig14EGLg7 MoGMXc1QIUwI9VPTXzW7rL+3rXtswkToRwGQyACBYVzPnP9Jc= 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> Precedence: bulk X-Mailing-List: linux-sound@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 | 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