From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 C2B2D3B5826 for ; Tue, 30 Jun 2026 06:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801319; cv=none; b=aD/YiZqC8a2ZAsBUKRMV/z+Izb5Ng0BKiOls7PZBVDWqHLF24apj3BHv0a0Zwr9zqO4/w5g3SLS96v+K3Z5GOTMgSLTaIUBEW6ZVPdzFHag/658WOVnYHGKDIpNAW38gZfNrPHqHxAhVLiicfJJBfBTi7WNgrbRwSneOckL6qkg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801319; c=relaxed/simple; bh=WOalQFBHar3NvkPew2YrsEq8h801FlbaMFuTGotQNTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BY435qg1pPaGfFzZF23HPUgOGto0NIF+vUbV6HkYi+Cjv3mB1HWvDZnROf47cmxmvm48BcV60TKLsvd4p/bm9p++dviAAyTc5oBBHfY5oWOSNFvevNcPU01RRk8NdiGo7uKTowCqMPFvVB1edZZYugA0KJVHgJIEsxb/OjJNP4g= 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=LzYskMNL; arc=none smtp.client-ip=209.85.210.178 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="LzYskMNL" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-847968ca62fso920764b3a.2 for ; Mon, 29 Jun 2026 23:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801314; x=1783406114; 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=LzYskMNL+14eQ2tggYiPFWy3MWiugToAkC3ak9bANGJMMLaoA9xrI27y9PWHfR00aj Cc0m3nwz6XiMNCeUfepO5kCw9YlKuPnH41nLBZmFRM0Rn/Qfdt+fFkM4RBon9z2K8ajS 7oxgp6+Dx7M/NQhVUgkEmJobK+1fY5tpVcyDkqh6HKdfFoTl1GY5LV2THDvTpcMhMpnH ZQxZvgUHUMuH/ijkO2i/c/LEm7LWs4+0A30WmP0PnQK0mvkLCY4NEvtbFkheFWrIgiGn LXJ+TjbDSoabZi9X8zZhu6PVK7gfCqLteAKKzLqqftgDfo1ZvYxJW4cwozEqbBvEu51V 9ZlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801314; x=1783406114; 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=L9yh4DQmiKBqmqIX3Ov9z5zAAFR3ZYIqZnzX7OCre+z1SV7+4suhrSRN6VdHPC4ScT Ac+r4XcJ1mWRThm9GfroU+UV5axp9tGh56GyEAU2EnFI5rxperL0RpqJHbyGDVPeO7OH LP7q5pju6QugN49S6ZOBW+e4zuzpVgkvbpH5T0I0Ccnog1GeVw/l88Ki23BHOKzRc/SL xZ5GflAKCYvLhwzk+AD04qJOdPh2UbT+cYNOraqCuoLfLEsGeYoEw4QABnxkaoRG03w+ RZ8cW0K/7ZC6gEx28qGuxvX4wDApa4tTeRODSxwLYi+AI9VvhUcJgPbOZ/c808IEPVv6 fv5g== X-Forwarded-Encrypted: i=1; AHgh+Rqzu9WPM5QQjI4wFvlL3Tkk+WqRmG8pFAF0M+4f9QwAKOFSXdZjVJuZczz/Oqu6Nut4D3aopy+t6SxsSXo=@vger.kernel.org X-Gm-Message-State: AOJu0YyiS4gd3Phdk2YmJQwCP9hdyIFb/6fHAJOJ2Y9Bp0nYBDJ+hjE2 906aIZH2mMyt7lTw39RSGLdZwg7zmQniukg8SQKPbmOr8LhxgV1jtGkT X-Gm-Gg: AfdE7ckVECQgDUAsmaj2pV+ypXHqistEnNjn0iXCiMCpWQI2cgSc6OArd3d+bNz97eE uZNWsXdpnzJeZTzz2IcZ1/UlGBuwDPA7m2gyh0yu3g3eUfPyi4mJviZ7epq44m1etkedCMH45Se UZ7ndebWrfRASitNxTKVTxuANGOuA8MagNlJC2bXKFnckcRc+ExJwunWqiMZzuSK5n5k8pEpisa 1qZiu413kZbzyslBjX3rRQSstodCQmrlBmiuJCXrH4KH3Kk1aQjneWdt4MN6CTiopgOuoXVuibI BGanIcnDtFJTaQUAsuyqc0Ro8uxvjfMdf7dsUYlT2S6lKL9dyX2a0qe7s0qAn581JewC5Vma7KQ kY+FSX7ISdxqBMeK3QCHiZHp7AnnGBZzzbZMYw8xMXy/H8TV2cK2jJg/2wDAyoyYii23L6cpBQT aNi8e2wr38EJxKy7YFpICQU2FWEwL/hWJs6SBASitrui7bsRo= X-Received: by 2002:aa7:9a83:0:b0:845:c694:5c48 with SMTP id d2e1a72fcca58-8479f27b317mr1885937b3a.28.1782801314552; Mon, 29 Jun 2026 23:35:14 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:35:14 -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 01/27] ASoC: codecs: da7213: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:23 +0700 Message-ID: <20260630063449.503996-2-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/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