From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 1DC96343D8A for ; Fri, 31 Jul 2026 03:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467416; cv=none; b=K0w539F3VVFWQDB5zRNUg832W3PL3j3cmTJ8RsGBrbnvFoWzCfTmgNQNT/HDukNEFVGDo7YpZ/wFctC0rNahsE/6gWmrCEptbkmNkSmJ2Q64gOPcNw//hW9wn5gcTW5BgJkXKZAWs67MFQTpM8fXd1x4jSpjfKxhvBoqVTD942I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467416; c=relaxed/simple; bh=zFW9Mx0ZXn7hF454QrxJfQtGJ47S/hYdOGWLyBiXIRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lyZcIKPwcH/DjKhQu2T/aSYnuWAwodHF9KwXGq0yDuhsQ9STX/BHiLoDLMtkjqMIflMuMfP6QegjSM89FXu0uTNd126QXZrMMityW2Z4HrkMbZgh2nYklFu9O6FYz0IGqdvI/MgZyc1fLt5COCtxdGYIut8SXPv/QYdCO+BzDpg= 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=k0mcTgVm; arc=none smtp.client-ip=209.85.214.169 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="k0mcTgVm" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cca0c5799eso4005075ad.0 for ; Thu, 30 Jul 2026 20:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467413; x=1786072213; 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=k0mcTgVmart+zf2BqCt4W7qO6jtcRZhtiyAW8WfCS9gXKW75p7mntI3xuvHE4JlXnW goRuN+n9LEqBFtoqb440vonEbNO5pfO2GD9j//cFHH1u6rPB3eyHPkeVPJZTIm9NW7Rh EJVPMyH8ELjlscDQn0CeMhhVlKOg0fObUsZ4fXX4OKN8ZfMZ8hGuz0pvo8V1KNbTfGx5 FisDMLdul/LV3obBIs3KxhEDzgQU8rLb7K87hGhUmeAyBMEqMK+wufCISiKfAPvrNOFq GaQj725DJ4YpL4wDJH6syR660oH2qBxwdD+yUcX7uzY4QCFZ44mwbnV/sEq0UgVj/L84 F2BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467413; x=1786072213; 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=B1yr3O0QhNWxD6lHvCsE+IyyH47JkPqEc3okl0vx9826GaohI8DRNcGTdo6QA0R5AN lNQ/sRCSTrvTuSGTswycy5/+RZhsRa7D+xDipSESlq2Lh2XVwxeN5aIMHklMReozCGZO lpX+qIQwTddibA8WoOT2ra+XRqyWf8LsxUXu5joIRDZ6mC+QI7VQoYZX+QowjvvC/zdL 1rmKT+gguWBbk4bvWbsSDvUwXMdFVScRbYErW/hg0IaGLvO53JBttjgB1LfnZIqP2xZb Qt8zHo/3O2BkwHH+jreEYrFmL4EPEMHV/6gsU/Q/pazKz5Qv1fuiULc9PH2CODXdmuHm 2Opw== X-Forwarded-Encrypted: i=1; AHgh+RqWqb9U21f338JE7/Wzs+CX8yTQodoztpNRuUSkYcD9FdwyC1plQxUx+zE8wqOemYB769VB7TlcFS6Km+g=@vger.kernel.org X-Gm-Message-State: AOJu0YxPgremOrSbmMr6NT7RaY/KtRnx9lGCmNJp92rqsVsNsUQ0qyKK LpboKfvWwoRlB8mCkeo4YFDSsfoZbBmff55+WnEI6bOqQJdidzsHh/yc X-Gm-Gg: AR+sD10pduWVJTivrUISmKyPyv1ABXbA1z5PTvJyipizy4lOsF2LOF0QTxEmnqZ4R9r G+Dx7REc53Qi9DjqwQc3U5fuxrxYaG8lRu8+u0MNeakcyv/z0X6rsBGLshb4pqh6LDTX+D9A2gB SNMHWXwyE6YwREwaC9xTFNWVJBb0YWQXpTMRHVwGHpyFgq8EIyzVFaaqzdgGf+SGOYdXOTIyX+1 L4Ybxtaa4eKtlRltrzOrFxkqzFuRdkarvujfuTH1xy6XgCiEFjJnujwV5rNEWgeJ6prTSJFMM8r cFN5PgcMpC2ZTBDZPAVESGbdzIamAmhT9h7HaJ5tonw6zUTlD5Ks1BDD5lU32F/4zWqTBtmP88e mObXCakyVeTJl/0Ww4JFVhEbEr8+WKCZ+r0pBA777sOnCucFjmBTwWRB5JNm/Oww3r05Jayfoyr LLCtWF89uM2c85Fqc6KPY92O65Eqd5Q17N0BBF4osPr9rh1do4WfESAnbwQK/F0JmB1ur+Y6wZv IKW/3QYS5a5G+cKI3Y863KFLtgy9F1lyqpdTv8hIVljiY/uCojn8/0kf5UeizhW59xDn3AulZjC 1ORY X-Received: by 2002:a17:902:dace:b0:2ca:1b97:70c5 with SMTP id d9443c01a7336-2d046d6f43cmr5259425ad.4.1785467413330; Thu, 30 Jul 2026 20:10:13 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:10:13 -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 , Cezary Rojewski , Richard Fitzgerald 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 , 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 v3 03/26] ASoC: codecs: sta32x: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:25 +0700 Message-ID: <20260731030648.8706-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731030648.8706-1-phucduc.bui@gmail.com> References: <20260731030648.8706-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