From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 370A53F12D3 for ; Mon, 27 Jul 2026 09:44:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145468; cv=none; b=V2yoN8GVwTs1bBOXOTu9QexzJFQkwH5vmee+y9vlq0JiGSStuVYCZP+WGZcXNSbBnQtcdFxhhJbn+Al8nqZhRl/LudKEB+igZSdceoZYDxDpVOeiLW8az3RVeZFVfHaic1dRFQvdY/Fz8k05D08eaU7LiimZxrOX2Wh6ouu9ylQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145468; c=relaxed/simple; bh=Ao/9uwAwCZ3n+ZuP9RpaHxQh/lAFXXxcAD7XbeFdYrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FJDIem/PLCUJTrP7XQBFAqNVA8SUnaUZ+UHNCjYjRy7v2eE+Xe3fZ7KrJD0vliCPr9RMt+lfcf/o0PRh4grS0cHwRsXjVie7FET6Q8uEUutAEr5zmgWwA3XpuqmcLehincOXzTKCd+MlzwNtwh9NC7pB9jOctQdJJe3SHt7ycHo= 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=eJ3wxvLr; arc=none smtp.client-ip=209.85.210.171 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="eJ3wxvLr" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-84862b0d5f8so1872976b3a.3 for ; Mon, 27 Jul 2026 02:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145466; x=1785750266; 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=mdOBdNsCZllnvmxLCxNmDnA7eIbVv8iYbzhQVFd/QPw=; b=eJ3wxvLr9Nr3g1zhrOPyt6jciNBFs/AxsakAWxNRb4yoLbjIQnQSU1LkCM3q0Qq3UJ b7zvfGQrp2N3kMzseMr1WO73RbQ79gaAp4SPG6242A8CS2GCZmccV/c6+Z4Ge2/2jGAX /BK7ewiYu+x355xQpFCWkYm5A/0E2jcyRWmOdnFgN2alNLRlZ1aNmjNfPQrBaU/7FUAl ZYA4For2QY6GD/lQJK4FSMgFV10LmSQvecP2OskHCYjmR3Bh5ZgoRDWqd3IU3KjiXl5q khz2RwyLGmqjR1LQd+4l2yjaQAW0iT8JvKFX3HgrrJzUk+QRCmDXtNheIX/BofR4YQVn 2xMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145466; x=1785750266; 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=mdOBdNsCZllnvmxLCxNmDnA7eIbVv8iYbzhQVFd/QPw=; b=U8xm85WeL3yyYSpfwIq9duDvlji9Zl5WL9ldQmRk7qd4+8ghjE/kU57Dx63UiaSEJK Cv2my/TYpzU99jMi+5jg4MsZtEZ3dA+YRuNy7NiEBmiF7sLX31yvquoP9mSrUFpUZuvG BccI8AA9MsJzRXLRjC2/SnkojUzGOrMfxJp12fmOk/0Y/xmmqIQrzrNlaQq97k7QT5zs mnc+zhOYgHdDi106WFObIAHoeBoEfgF0wOZQl+KJjdcth1Tnkwr4wZEdYP6iBYZzscWJ 6ypKHHJtBXreJl3ODQoooYrLJCbn03kExhi4wrhHh7aKWi5784FurHeiqrjmTjURoREx r0Kg== X-Forwarded-Encrypted: i=1; AHgh+RrbFI1ugjChmMjpQDtK9ql98CsaR1Mte1FwfQKjqwMA4ofoN2Tu2ZMSNRzk4UbxiXxHhjLFrYDbAoFiiE8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5DdkNN5MUh2SzJrxkG73IJ94v6TeCmrmr0S9m97xBx+fHV6V+ IB03i/MgcwVORmnjEwbdM4b/LMgarmwDVP9oEWXiz5TOyuX/0RQ88Cnd X-Gm-Gg: AR+sD10YYxjm3GtSZpcwu6IflfOdsokj/zUj2aG/e9L7Y38nvSuGfhcDgRSttwzqod5 N6f2dAemHYza6xcCoAw6taOQWpWxIVNmUPCPycQnXp8lmQqdR2NUjRkpHeHbyJRWxxm6lkxImAu 2u6RYOqQW2g/PZEkQQH1OLL/ltPN4j8TtWUWaIpW4iVccZgdgtU+y/E+iyNU/7EoQqd8GSVkvkP ghCV/OiTB6BAhmzbuVhVHR1RMPb2MhE+3RN4nf9f5uom4yH5NJ10QGkHjqxQK/858676bGBr9ll OO60Hs7fcChiiihhUBvxpQpKW+7XcaqqsKa/zal0fR6XZA823TxOHjXwBgM/odDQvBOQ5AhgAfV pNSwIWpQ9+dMu9pKLarpa8JOsewvCtTEYBMTTWr9GjX7hOX74q8woFhvgWOIZhxRlNkzkGnbH2E c+LSKb0wgbGuLHdon3j5hMdPTTvTyxIboljR11Tj9/XeRFz1DvMvZpYeFsqjx4e7R1XNoUdftNv Oo78W6P0s20jkVh9RQEgg== X-Received: by 2002:a05:6a00:b95:b0:848:30c3:45dd with SMTP id d2e1a72fcca58-84e5942da15mr6361773b3a.11.1785145466612; Mon, 27 Jul 2026 02:44:26 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:44:26 -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 18/26] ASoC: codecs: wm5102: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:38 +0700 Message-ID: <20260727094046.23001-19-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 --- Changes in v2: - Add Reviewed-by tag from Richard Fitzgerald. sound/soc/codecs/wm5102.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index b4d4137c05b4..74b775b95bfd 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ +#include #include #include #include @@ -667,10 +668,9 @@ static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); put_unaligned_be16(arizona->dac_comp_coeff, ucontrol->value.bytes.data); - mutex_unlock(&arizona->dac_comp_lock); return 0; } @@ -681,16 +681,14 @@ static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); uint16_t dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data); - int ret = 0; - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_coeff != dac_comp_coeff) { arizona->dac_comp_coeff = dac_comp_coeff; - ret = 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); - return ret; + return 0; } static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, @@ -699,9 +697,8 @@ static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); ucontrol->value.integer.value[0] = arizona->dac_comp_enabled; - mutex_unlock(&arizona->dac_comp_lock); return 0; } @@ -712,19 +709,17 @@ static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; - int ret = 0; if (ucontrol->value.integer.value[0] > mc->max) return -EINVAL; - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_enabled != ucontrol->value.integer.value[0]) { arizona->dac_comp_enabled = ucontrol->value.integer.value[0]; - ret = 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); - return ret; + return 0; } static const char * const wm5102_osr_text[] = { -- 2.43.0