From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 E982A3C9891 for ; Tue, 21 Jul 2026 10:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629589; cv=none; b=X8dICTpwlIWI9zz1uT4b6mGMMTKEq9xmzLxSGoJOPs4k12LPBUCc6KuKTjYk/SJ+kITd12ddnxMeY0dv57QfC20algt9AKKg488VgIGIIoVehJhLTTlWPr9DDQt7p/Y6sj9gJQJ0SJGQIHfb2em5DQIiw2Gw4xayIDJGEpPMvPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629589; c=relaxed/simple; bh=WOalQFBHar3NvkPew2YrsEq8h801FlbaMFuTGotQNTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tyxv/lG2g7EW2ZlTgOwsZrt5ZeWqHcu776Y8f/JmU6qXa0WH95M5VbpNiof9Gi9CUcrnJLryJPF1ZGsDdbo7spCM8H2DV/GpKVJk/G3D28D7LUhwe0VzOtFo6sWuior6pzdXFziEjdQjzGl57oWbpbQ7yIABEGVaA5cUcCBBZEg= 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=GfdBQlkz; arc=none smtp.client-ip=209.85.214.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="GfdBQlkz" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cace91f112so114269925ad.0 for ; Tue, 21 Jul 2026 03:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629587; x=1785234387; 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:content-type; bh=i+E/hLMGoCFm2Bo6D9s4vrTO1A3cUntDy1XLWjBr550=; b=GfdBQlkz4k7ZCnVEiwGMoFrpOhIXxCxvteueCP3fU9H9pAvHNFhz6gLZSJShcOqeon P1bZe7MvYm0c9C+iJ6S0HNkTRxIqXOyhTZP34APSe2MkX06M/Nk7Gatng8FHYH3MFlf/ dNDBSACA2vH/eEo2k3OwrlzJzVDdUEMGfkP43zZvgsRu6HSbdQd21OhcxvUsRMGu1+If hYk1nJX1XtEh/t3dflx4KKp8m9qIqNsY+eHmciieGAPVvUBVjMCe424JkBpZeVahTJfy ZZrLBwfFToP6/J8P9fe0x0EIA53LTv5sX43mThMAHsMhijKTLgX1VVy8/Uf3eieKxkbx s23Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629587; x=1785234387; 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:content-type; bh=i+E/hLMGoCFm2Bo6D9s4vrTO1A3cUntDy1XLWjBr550=; b=Ho/U/JxW2ETVor35dVlfOQ9B250trAl8OXO2WfbLEWDvG++G1AaIB7ujUzyuo1xjV0 tHnNRkwX9DZ6JC72R1kRSJTOJ2VoRHu3/RXnYe2CP2CeABPDdQWT5EOZBPIDxinbr3xM g8IV944pzHu/LsYof5gtUj6GdOylM72iSV/j9NVrJXtL21KLBEmnKc6bElgDjh4xrMWg y20fPTETXYf5LwQOPGgzcogy5U4Xw55HZYS3Cw5LPyFGxPn7bEdEfTCEHzxkDRbxMU4T pNc8gfAWqT6NOpQeTRIhYFDHucHns4i5mtUUqShCwCGkBoZDBkKeOaetMfWdpckqts6c 6I+w== X-Forwarded-Encrypted: i=1; AHgh+RriLBVrFR23Ysfo6dyZN++8B1iaaNPnzClgHk8+5UhDRpmIVjsW5lUiORJF1CqmcRwQJXDqAq6rYzyp9w8=@vger.kernel.org X-Gm-Message-State: AOJu0YyHY8QNwDVJfDVY1g7kJXaNGmu9EYbicIEsQQ1mSBKTuawgwzsJ KRCXL8i76UX4uB4tXmQJxjKVQ9j5RfH892FtlMTd0k5vhtqxfZ/b+pOa X-Gm-Gg: AR+sD10oZqV8a7MRJ63q8gTQpsFQTPQzTQKQwGCkxhkfguo49eYL7hG+kt8UtG4YnP/ yzFusARoZAlZNHe7UUuqOgUlpuEQjWdUhKdcMVT5J9trFRiimt7i+xmM8a5mWP/2HNxRGrvNEJp 3TVfCsquLPblLaOOCIp0bh15hIeq5SPtBevFDQ1u1NeVya9qTCn4M3z20whjYhCy7eZLmITMatk pOXcKqb0XnarqdQZz1X0H/au62eGNnQEnPtZ5+fyqqcnEc0V2vzflffw11HbYb9RUlhHyfksAkn OHsPFo03B333WHKFJNpR5aHkjtEjpqZUT2Hm8t9q/+cvAvOZYu3sW88Eznor8n69bDkvizKvLwn 9gbOGUDr1vcpnV0Sx/I9jKGZNhoXFi9D40OSLsqL8RosXy63Mo5jafWrc2qNpLX07ExHnpS3C8j +VFFjzzj+xUnhm3OYl3f1CwDufZqYyZf+Swy/aXQNEO2WHEPE= X-Received: by 2002:a17:903:1110:b0:2cc:89ce:2ef8 with SMTP id d9443c01a7336-2cf34a2ad90mr188368875ad.40.1784629587347; Tue, 21 Jul 2026 03:26:27 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:26:27 -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 v4 01/29] ASoC: codecs: da7213: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:32 +0700 Message-ID: <20260721102600.523199-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-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