From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 489F83F4DE9 for ; Mon, 27 Jul 2026 09:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145461; cv=none; b=NgRjmXo3pqo8JIgnw6SrutZdgx/QOcabglKeVrU4d/4o7WPk5WIJrrtfciAKeWdI4e2Taeny4LCMbwPSXiYRBNW9GcgokDmfCcwOX5cNUBS7unD8ndmpeDeYrKj8htdlP74xQ26cOOQIrWKnjXe0m5UJzM3bDoWmcFqNU5nb4Xo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145461; c=relaxed/simple; bh=2ZQcxyuElWSG2ZM+lBRNbAim+UgXbAvs1+qEvw0iTPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BdtiwihDjZH1tNYthmvqoXLtbtinPTFvYUgqaFifySh5BVqsvheq+3GMhvDN40HEDpencJz4o34WymBmI85tLyBj/CVSPMDVH6Ho0RgwtTlWbi3lK/mX9cVe8N67h2bEOgB9F7UisBAPmbzVN+DHVEjbvFNAyz2DzBeBXWOmUSg= 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=J7DODWHw; arc=none smtp.client-ip=209.85.210.176 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="J7DODWHw" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-8453427d3f4so2553945b3a.3 for ; Mon, 27 Jul 2026 02:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145460; x=1785750260; 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=pRp7w3aucssFRgkLpXLJWYD4cpAPyrp4T/SLglC5YPg=; b=J7DODWHw7q5CKZwUshAO6TxN2MtImLjojvctaWFQqWsaMRqmHCzn/ImTs0LUt248XR YRACEml63Qal800tKe3dpX1wgHBSLEj3V4MKQ9Tj6msoEe4CSxpLQqhqJk9QJmJaMkxR pa5b5XLN164EuhYdYVY9TaQNQNbZNFwZlONprCanRcD8SmNOXm3NX9+wBIcrZICG0Ipz LQWMznjGrN8zP+NK5wvjFSssFW+fI4QMlDr9vsFew/rgl5KzjZ8P0xDA3j0sLgx0ESzs GHDfmnnMXASUGdgeBuulGGE9NZlcYPyXInawIb4RdeWaO4ns0/bSj9RbDZ5h1XJiZvL5 iNUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145460; x=1785750260; 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=pRp7w3aucssFRgkLpXLJWYD4cpAPyrp4T/SLglC5YPg=; b=cqpcP54r/vusbN8Qhsmf2eAQdB6yZEh5cULZv4pnqLWzPaJ6SivNNj2PXzOoUBGJSa 1VHm0aVRN1BMxvQtzDUb3YgLja4vQmTemVEFgtQaY4JDasRl6aT4LBK23BL7pv3Qwp4I qB3Qgox92eUq9G/JY1eKl2EtihF2R/2uf95ART9rk4lZFOCFViayyZ48H3YzRV/t/u3E +/SWB2HDP8nKlZ7RspedrdjznSeczrzm3WuBfchdKBwsHCgY/3Ex1A3ttAj49cOb17JN JpI87yIrUq+JaElCS7KUI6uBlSH+gew7Lh+xbCxLCsTl20TevxXpRnncnsB40M1CaF4i 2FBw== X-Forwarded-Encrypted: i=1; AHgh+Rr/wXZ5NZMLl8LdrzShl6/5UJBnoc/JWjT+3v/oQmV4d2CizOUDsnqU3WoKOePJw4tBRzFIhNV4ITsdVn8=@vger.kernel.org X-Gm-Message-State: AOJu0YzbyfBgfRzm8VcUJtUjiScGZA73V4V9uidJn/RQET+q8pIVdWCt +GLNH/LTfwSib5apYVHmn9gtAxpXN4dZ/CgWBzozQYQA0ldoMTHsUr5u X-Gm-Gg: AR+sD125dS3lvXBZsCga0iWyVBok5bmDViE6x9pSvkXfGYR/aP1qIjFKhkZB0KkeNOI DqTazr/7Y4B8Tc0+ODkYVG6s4KQq1Gp0WoTg3qVHB8HzaUy5Rzd+dRKijAdVa0JFhHSBrfFn4uj Q832n4KO5y9aAEJwSfxGtmY5VHxdYm8SphNcp+TiyQUBhSmY6bvOAR45kM4kaxHRaCgtuHkoj8P mE/sdkk+8kEv7vS8Kew6Wxnz9K7hiMOERoM1EDnFlrt4enkQV636H6v4JY0iQ3WmcF4gJjfU0ze lGs1fGbEn3FrHH4B09pwPXYhXiI6h2AR/MlvEFMTYcpO5yZm842cwWroi0XQJqOYHvEIVPC5Tbp Mmnx9sUbriZF4NWzsGU8C+RgviV9oGiykfYC8Kz0AdV+mwKMFI/WuI+9/9VDXp3weVbYtL9wt0L ygL6oMbp6/QitXtKSPLq/mJ1/4IMmLimTVb/dkleOI7Iu1g9BQVRe+FRIZ+bGVxJHEi2Lj8sGUN eKPga/jChrHzGwctwLG4A== X-Received: by 2002:a05:6a21:a49:b0:3bf:9c93:ac44 with SMTP id adf61e73a8af0-3c67dc48cd8mr6943629637.19.1785145459621; Mon, 27 Jul 2026 02:44:19 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:44:19 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH v2 17/26] ASoC: codecs: wm2000: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:37 +0700 Message-ID: <20260727094046.23001-18-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727094046.23001-1-phucduc.bui@gmail.com> References: <20260727094046.23001-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. Reviewed-by: Richard Fitzgerald Signed-off-by: bui duc phuc --- sound/soc/codecs/wm2000.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 9b68ee69324b..897b0acac5f3 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -612,20 +613,15 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); unsigned int anc_active = ucontrol->value.integer.value[0]; - int ret; if (anc_active > 1) return -EINVAL; - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); wm2000->anc_active = anc_active; - ret = wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } static int wm2000_speaker_get(struct snd_kcontrol *kcontrol, @@ -645,20 +641,15 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); unsigned int val = ucontrol->value.integer.value[0]; - int ret; if (val > 1) return -EINVAL; - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); wm2000->spk_ena = val; - ret = wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } static const struct snd_kcontrol_new wm2000_controls[] = { @@ -676,9 +667,8 @@ static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, { struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct wm2000_priv *wm2000 = dev_get_drvdata(component->dev); - int ret; - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); if (SND_SOC_DAPM_EVENT_ON(event)) wm2000->anc_eng_ena = 1; @@ -686,11 +676,7 @@ static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, if (SND_SOC_DAPM_EVENT_OFF(event)) wm2000->anc_eng_ena = 0; - ret = wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } static const struct snd_soc_dapm_widget wm2000_dapm_widgets[] = { -- 2.43.0