From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 8955E3EEAD8 for ; Mon, 27 Jul 2026 09:42:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145337; cv=none; b=WgsAMDo9llhNfsrcV+HFLHBku6wHlF0hWDBR7jq2PtCyE1L/2x91hdDEj+gFufBGgsu5ixOEu59UOZtsS60n3CQ4q46KO1m161Q//DhZgERYN/PU/afbrRm4/Z5mcC9TPcFz1pogoIo4U15X3rWXnEM7hLQxK6Az7vbN3dEnHlM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145337; c=relaxed/simple; bh=zFW9Mx0ZXn7hF454QrxJfQtGJ47S/hYdOGWLyBiXIRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DGf/BH2y0+1mPbg09Eei1tIsLlWUuxVnEEAn166GfDnPalMarbQ+5aShIAK+REJTyBpYKLLvqauCqigSO7n0dFKAfaSc5WFaJwJQLfYHgofjbTE6U2qFUrBn5XO4v/x0YGAIyal5+8XNh5yx/6iZkeYMEN0BS/lrZF+/u0fP06E= 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=Af8b7o3D; arc=none smtp.client-ip=209.85.210.179 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="Af8b7o3D" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-848643382fcso2487817b3a.1 for ; Mon, 27 Jul 2026 02:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145336; x=1785750136; 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=Sk8Pesmwy74AH7VxeJg8H8U9dR5/4hjKm/qPKsN7J90=; b=Af8b7o3DHvg7p8WODUFtjMjLKcnHl81tUXmHecbMvfILAn926Sah9IiJh1vtG75wDi iL7JT+morWA/bmtTKLvYO0RV97Ke/U648y3YgrdWBL2FKpch3bFZBQxCWNppHahGAfny lvbJvk0qB/AW3r5r9LL4WSfER4QLJFA+y3E3xxr9FjT7C79G44n2wCTec4v0BrWbiBlr K/ErfGAmN3uz+3qXMDXO6bVe72RFXn55rUXXFJyWahp5XjIvh9J9YNChViGFaS8SKmPf n8dG5BQ1pZmnXpSn3RNkAjM/tKq0w7SBavsqRwaru9kB8wybvkjWHBTgxUMXHy/FIMXF DMwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145336; x=1785750136; 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=Sk8Pesmwy74AH7VxeJg8H8U9dR5/4hjKm/qPKsN7J90=; b=BynfbMLX7+j3fu6GQyXs1epO6Q+6dgG/bKeKjxopEA0aGCaxKfd69SbtvXmmB0lXXy QhUMcyMdFGMhaHqc2ww18sbcUnqB2xOIP5d3sg43zFXEynlRnDGFshTkJMXgSGVYAh6q NsuEjrzaT52XbD4LFFcipkGsyy4otS3V851Gb9UMN8p7BdX5AgjoHsyyqT9UUMJTOu8P O/M6o2YY/5TEsu+ReUaphylqtIpvQ/seKJBM9De2Z1zEGAAKXF8yKXA1TuAC7oMiRkWP mEIqtgfLqKwF2hUenM9ADD66lkbbSuzHs3o/4Is2Qs7FtvgtczJ0R/M7A9nqs6AX1uvc RUMw== X-Forwarded-Encrypted: i=1; AHgh+RpSSiMPbbrfwvleUOq5Lrk+q5NxyuXEuiLfgPpQEqZq+upQsrRAmlcRv73QoDbjsm8f5K95GfXIl01m/8s=@vger.kernel.org X-Gm-Message-State: AOJu0YxFWT39va0Bm1Iqa3wK7vRPfiba66f6FmCNATZYgPjuBeC5zQau 30bQJqNDr72wRoSFMiT955wzboS8ni83ZHQWmnd63Reb/PoJ0oNbtDaC X-Gm-Gg: AR+sD12NoplBoP4fff7PkdptMJbwulIHmwh+bh5R2xy6yQuURHI+jgdvPiIyK14fpxh 3dXcN4J9dyqlDqqV6RfcR+UoChLuYwaVKtWvnaBjnkpZU8CbQmuMoeljgomZ97iPLs2QniXlXSL 5T0F27XNjeBxScgzGTxITl+/K9ZihsPJz9neCpLBkC+63NYEjA/P3rxVwa2i1iadtCVVUXn/Bbi J5z+1P/X+ImzP9HCzCkQBqA39Fd9CAgb+7orT1XdyYoVH5VoP5afpkjnE23TvlzYMLdF11e0Mj9 B9qvPLRTkJUqeS/vyzbeQoPu29+XjQbP2KgpBKF9RgNGKHQV7PjvSDwohV+PK4tJRNXUxMuFzdU fqr78f7/axacho9IpxApbvlXWd+eikvfzxFEuUNAFIRed75tfagN+/Yl2ZXsVJ+balvvWZYLPLk eZXRmmUzF49009CveRfgP+2XWTjUv7md9J7Cxl4vceHqeu+iMFVyKkkaDUb5DrxGkwj2cIinVrh MksiZ7yC3IJZhw3jDxp2Q== X-Received: by 2002:a05:6a00:18a0:b0:848:57f3:8f8f with SMTP id d2e1a72fcca58-84e5958685cmr6221195b3a.51.1785145335786; Mon, 27 Jul 2026 02:42:15 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:42:15 -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 03/26] ASoC: codecs: sta32x: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:23 +0700 Message-ID: <20260727094046.23001-4-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. Signed-off-by: bui duc phuc --- sound/soc/codecs/sta32x.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 652c6e3a9e63..d6de739212f9 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -269,9 +270,9 @@ static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol, int numcoef = kcontrol->private_value >> 16; int index = kcontrol->private_value & 0xffff; unsigned int cfud, val; - int i, ret = 0; + int i; - mutex_lock(&sta32x->coeff_lock); + guard(mutex)(&sta32x->coeff_lock); /* preserve reserved bits in STA32X_CFUD */ regmap_read(sta32x->regmap, STA32X_CFUD, &cfud); @@ -283,24 +284,20 @@ static int sta32x_coefficient_get(struct snd_kcontrol *kcontrol, regmap_write(sta32x->regmap, STA32X_CFUD, cfud); regmap_write(sta32x->regmap, STA32X_CFADDR2, index); - if (numcoef == 1) { + if (numcoef == 1) regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x04); - } else if (numcoef == 5) { + else if (numcoef == 5) regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x08); - } else { - ret = -EINVAL; - goto exit_unlock; - } + else + return -EINVAL; + for (i = 0; i < 3 * numcoef; i++) { regmap_read(sta32x->regmap, STA32X_B1CF1 + i, &val); ucontrol->value.bytes.data[i] = val; } -exit_unlock: - mutex_unlock(&sta32x->coeff_lock); - - return ret; + return 0; } static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol, -- 2.43.0