From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 BDE5F47D936 for ; Wed, 8 Jul 2026 14:19:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520353; cv=none; b=QknKLegZbc+90ibrgl2ExP6vZiEG86z7/r7Q8EfSgwdb4Hxy+KkZs0enSbS8v5iX4RrU8QOpGLchlObq+UnnX54kP1aCkISSf0eR6QNfMb49AHcPJDLKx+s9Ad/65v5k522sz2yFCaPuMG5vjRT2PYe05phOjTD0hxzuIIGKx/4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520353; c=relaxed/simple; bh=WOalQFBHar3NvkPew2YrsEq8h801FlbaMFuTGotQNTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UuPp0vIFc5sec6z6kCGYk2LHSvmsTxQnjqCD0JK4453quBq3BjCXR9LvHUJAvVFS/tcZIRsJhqWoLWaPCwdIQ2E6jBeY+y792OoJ6BmdUKY9g8QuCxLMRnpbMHjdIvG19Sx3S47DsVZGJDOV7uF3Ki+/NXWe0Yod2BwnEXEX6Ng= 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=PFLtRF49; arc=none smtp.client-ip=209.85.214.173 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="PFLtRF49" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2caed617615so7518025ad.3 for ; Wed, 08 Jul 2026 07:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520351; x=1784125151; 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=i+E/hLMGoCFm2Bo6D9s4vrTO1A3cUntDy1XLWjBr550=; b=PFLtRF49z6RnaKPh+ycuFCxr4iTTNU0r8lVzjN5ZsxxaTx+0kQ/6H9le3kdJAV03YH AUDAHvBSNUISYHC5Zcju/SFJhElyZCv2I/Te9EI2QTMWfKxqApRFl7HlkNo+XvqHXuQy qwNyL2T/uwT+s027qzIS55n9AkmjI5OB60r2+C87GFVj8RUIXWJ6IWV4Vg1EX/6qFX8c gipPUyVVY9lqmmoOnepwCxVWck/kz+zCcIpMa8ZgTEEEFD9O9wx2vk16K09JiN58QcAg 9A4uBye1Skwpk2jzVYzPp/oZDGrwk8W6WxpynxYg2TFCwbUWhPs/Xf1PeiFwItg9YA7H jy3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520351; x=1784125151; 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=i+E/hLMGoCFm2Bo6D9s4vrTO1A3cUntDy1XLWjBr550=; b=gu8KU+7m46vfRCKz1iH1XiTMB0NkUDAE6N9vb/jgf+1jDpy02GH0M1yKCxT/FSTQI0 fpfQg1YS/hQdPJigXsq90XPFREcyi2Zf/gqtlGrtgt6AQjRDO6WRodSDRMVu3jgpE3rO BBagvkr4S7Zcii99WbsYonaZEdrBNe0/sTMaGyGL+tXEPUlPt+gWluCxg7SZjDoupg7k DMFX1UPXQ9IC39txjFVzhWW80otFCEv92Fnm/8DH7ho9QnYr/sNbrkQuBHAyvAVf/UvY HvSgSt+s+w31deuzXGBj7g0G6GoVikEEsPYNBgEGR6caupKminBQTukobiC3fYlJx4gf 9sMA== X-Forwarded-Encrypted: i=1; AHgh+RohOn1dB9UqkxX7e8QAtiQKUQKvgfVUbdcONaSfpt8YV4hzS6Lzt7VL257mMwfU9gD59ikkO2d+9XP6ORs=@vger.kernel.org X-Gm-Message-State: AOJu0YwccoCxSy+KRBLWR/qBVttMZHiWqoGEh4Q+hgAPXXMZQhYYMiwO TcfEiSrQGDLCaMHIjCiEIvbY2Jtxxn1HrMSq6PHteMxzVBbqcMFa+LMm X-Gm-Gg: AfdE7ckfGodjqjHQwa0XCMLZarF21G/KTAAlmNbemvtsnd6Ctq1QoZnKWkEIKldRmKx Tad+ZvWlt3fNCjYqJyD3n6u2HaxAnwiIsBMCjLzTvbLWWy61+fdntxAyZYwZl1g8131LGGy5jIV oXygHN//5FX1Zg1C6/zGeeIet9bEk4svGW+L2w+t/klIO53woMJx4298SYZMqwEvzUvilAhK3jo DQ5kPIMAd5zgP8EET6Y8Sp7AZw8nKx8fvx/lnDWj+B4aveSIar8lOVtwQ2O0xK+AS75B1gya7al 8JBO5dAIDvKJeu0Cc21FIVbvSsHKuuykxbQllCLVNCEB3KxTONcdmj0+R33WOqta91WZnYH/I+L 8tdN/EKWc+3s39uvwVxI+oFPv51PjOg2mLGfaDYguOeJb2b4b+yWC+di1Krkef0BdnemusSdUS7 IAe/HZpIRBi77W85HF3bKlqH8lgSaBv/2bwzZtxETPDvFaPR4= X-Received: by 2002:a17:902:f64d:b0:2ca:b8d:e65e with SMTP id d9443c01a7336-2ccea48bc51mr27117655ad.37.1783520351057; Wed, 08 Jul 2026 07:19:11 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:19:10 -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 v2 01/27] ASoC: codecs: da7213: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:08 +0700 Message-ID: <20260708141734.578926-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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/da7213.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 4bf91ab2553a..923b997efbc4 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -216,13 +217,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 +228,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 +239,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 +250,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 +454,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 +487,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