From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 4E9A837F019 for ; Thu, 23 Jul 2026 04:53:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782444; cv=none; b=dGF6fRN8OHCy1W+9IdCJJDb/i4hDKKzEpw2t0chdcqv4mASp8CYO6d5fHk+z/1FgUXunZT2URRohwrQPA/GtJdpHpg0xQFrD1aD6oAIaMzmpYYjppwzD3nmuAhdFlA4VlwAP+TA7ce5JLBAtscO+6XEkX8noI1oU6YDse/T9VDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782444; c=relaxed/simple; bh=Fa/+gfQ3SzEgi11qWxA09O6FM4GPY4YkSzC3+KOzEZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JMF/nQUYUz+n6EclLNpmwMAqvKl1xoCy+UqYiwmfJNHFDj0RQmKpmYp+82BwppszeQWhKs3fbukHQXBqjgfVQNMeaJzFC1d17VIN8ZjFCi6f412I9NMibpE7MM7VshCkXZm2QrP2Dz73hmOy9zj66ZVytaNvwC2uSZ9PHGl9yb0= 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=HQ4YxXvW; arc=none smtp.client-ip=209.85.214.181 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="HQ4YxXvW" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso2455075ad.3 for ; Wed, 22 Jul 2026 21:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782432; x=1785387232; 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=aWHLEKCAQ5mV1sF9yyFHSMFUTDOduAtPgNwQ5RGsXm4=; b=HQ4YxXvW1HWsL77uOx4M2OlbEr+5qxltlY2cbuZduHJoDw8T00RUDWtWgZO4ioRGvY V2KOC6IAyFIlVIUxNRO0wSNl5NgBmPGePwXpLiydTgrL1YSku/CYRNaISNkmG8vTBCrJ 3uGAzW9mcaW32NGSk5owYwRikwn7dZMXZWLDahqnAlgG4EY/lo9xtxaKwNq4rHVU8Zcq oQLd2E8wwoZzAHn576JoxlXUB0b6Mg4Wl+yO2tFbxNiHGaKo+qo/Ditl8kOefZBUX3ER GpFexxbPzOOFYm9MT0G8PjZfu08FYgyBgd7ZDzuIPm5fevZoMCit7p1oDGtggIr/dZ4r PM+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782432; x=1785387232; 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=aWHLEKCAQ5mV1sF9yyFHSMFUTDOduAtPgNwQ5RGsXm4=; b=kOCxuf+HZzSune+RU3PtuOa67p0Sfsjo/5gJ26oPfmSUh62Foaj2fhqg3EDxDgtBG+ iO/m/kCm3+A8k2EdfAcOXoDib5oHSTVxdazSspfZJR4wH2Ln3q8drDHNfsCn0l5728rF 2EtJyHOAMUFhytn4pu4R7CFAqSpu/BHFjvqKpJglOCjGnM8zmBG8APMQ94BFoTYTgWpK 9o4PXPyc/uWOjT4vTCxtdY7VQbV8et1XyUB1MogzTONR4/T238HA6IlOtwvcam4x/3IR bjFUTnwoiRHyKPBHoKwOFD0y1eE5yylxJ8VYfuDuNhsK7pAReA5np1qE15gE5CMYaqVQ YyAA== X-Forwarded-Encrypted: i=1; AHgh+RqSp/7IunJqquLtmBg0hDt/K9pjYOXaDrReV/2C++ApTnXGPcfAgAz5ZfndWRAxFtg0rC92piGYvzaBfS4=@vger.kernel.org X-Gm-Message-State: AOJu0YxImQYjsmplhBrv7xYRjw4cK/PqEuF+exNRssbP0Wf/tEAwRWeS Yq1MANnkb7BQM9zIdrr/EWVFW6HoSNWth3cL+261N4rvdcKSC3nha1eD X-Gm-Gg: AR+sD13PsKTOUwAkrExh3y/n0AEC3I/ITObqawmKVzzP/05c4RTF7q8Upvy7dTNU7s1 309W20OW/wiZdZ2cGRj7QZ678txjw3p7X8csl3Rr3TmnH29PZg/4+5CpuXz0g8OINLgQKQCECQS Q/Yef7edsgVjtwdLrWCBDnyLZo602NKu20Q1SbRbL8l0HX5WXIB2z0RQ7vw+e5jD4S/HtqetYtI Xxhfc3TUlRqEIx0LyMuddJXjAeFPaLgFPdwaLOcNADd3AUcp7l19nXV2cArgGTf3BCdin9Y+PLa CILhleHg1nS5PvrEnWh31RPUsLU2+2ZEA4nmr9kriYGpoO/gkDGzz4L2tUlYZU1711QHqWOHPZ0 uIaWCcUB0nzp/oUoPVavP1OmARkp1s8dmPxMBqvouR6S3A/0zKvvYUJOup6Jw1gLV6JrkYj3Unv QBBuyNXKfOiAckLFkD7rQ8hvrf+S87uKn5XrFM X-Received: by 2002:a17:902:f544:b0:2c9:97a8:8c17 with SMTP id d9443c01a7336-2cfa71ccbd6mr18632095ad.42.1784782432272; Wed, 22 Jul 2026 21:53:52 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:53:51 -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 01/26] ASoC: codecs: sigmadsp: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:02 +0700 Message-ID: <20260723045327.28260-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/sigmadsp.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/sigmadsp.c b/sound/soc/codecs/sigmadsp.c index 2e08fde3989c..b7dbeb237447 100644 --- a/sound/soc/codecs/sigmadsp.c +++ b/sound/soc/codecs/sigmadsp.c @@ -5,6 +5,7 @@ * Copyright 2009-2014 Analog Devices Inc. */ =20 +#include #include #include #include @@ -135,7 +136,7 @@ static int sigmadsp_ctrl_put(struct snd_kcontrol *kcont= rol, uint8_t *data; int ret =3D 0; =20 - mutex_lock(&sigmadsp->lock); + guard(mutex)(&sigmadsp->lock); =20 data =3D ucontrol->value.bytes.data; =20 @@ -148,8 +149,6 @@ static int sigmadsp_ctrl_put(struct snd_kcontrol *kcont= rol, ctrl->cached =3D true; } =20 - mutex_unlock(&sigmadsp->lock); - return ret; } =20 @@ -160,7 +159,7 @@ static int sigmadsp_ctrl_get(struct snd_kcontrol *kcont= rol, struct sigmadsp *sigmadsp =3D snd_kcontrol_chip(kcontrol); int ret =3D 0; =20 - mutex_lock(&sigmadsp->lock); + guard(mutex)(&sigmadsp->lock); =20 if (!ctrl->cached) { ret =3D sigmadsp_read(sigmadsp, ctrl->addr, ctrl->cache, @@ -174,8 +173,6 @@ static int sigmadsp_ctrl_get(struct snd_kcontrol *kcont= rol, ctrl->num_bytes); } =20 - mutex_unlock(&sigmadsp->lock); - return ret; } =20 @@ -677,10 +674,10 @@ static void sigmadsp_activate_ctrl(struct sigmadsp *s= igmadsp, return; changed =3D snd_ctl_activate_id(card, &ctrl->kcontrol->id, active); if (active && changed > 0) { - mutex_lock(&sigmadsp->lock); - if (ctrl->cached) - sigmadsp_ctrl_write(sigmadsp, ctrl, ctrl->cache); - mutex_unlock(&sigmadsp->lock); + scoped_guard(mutex, &sigmadsp->lock) { + if (ctrl->cached) + sigmadsp_ctrl_write(sigmadsp, ctrl, ctrl->cache); + } } } =20 --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 64FA6379C28 for ; Thu, 23 Jul 2026 04:54:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782451; cv=none; b=uBCsrVEaynLsKt8s2JqBHiGPu3Xn8Yqkp6xJcv48flWpzZFJDR9OX/FC1G7zU9AriDWIPGE4cFCSp0149iuGR3+pjVoYlyKek3s+oLQh012fbMF6a0QdkkrbqXr/9C6RDNQXc++sAw6zIUqpxkzF1VRWqVXyVWYD++TXMbtOZlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782451; c=relaxed/simple; bh=GEVBslxyQTjWkaD769j6sBltZvw/8KgoyK2Jx23lHrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nKihYHGusI4Z8kd2/NYawgCiElcFxGijnABaV7UaxAM8IiSnpoIFw3M80Pjk8974R3vA2a6HGc8/syNMpga+asv6pV/vm1gANQusEVdxTQbhKKUKm0kuZ0w1biixjWhkjRZcsxX630byBevNeuvBHdX9Am2r7U9Bo0wQZZzJrcQ= 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=lCbCWYTj; arc=none smtp.client-ip=209.85.214.172 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="lCbCWYTj" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2cea3004256so2882855ad.0 for ; Wed, 22 Jul 2026 21:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782441; x=1785387241; 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=LJuHQA4AENaPcuIoY4pYQA3muOxiEnEKnbdN4NwUjpY=; b=lCbCWYTjXe2z4WlE6x40viO06+Re+eCZzkxPFIPfjc6LbHrBVOTDDSxRjEeFPNK9fN TUOyqu+0VFr6PkBmqLBW8p4bYBERAMLeUrVzbGaa3RKFdOY3rbouKlMZ2ezDOuY5ePls GaxH44+aPp3IBk5edJ4hgvg7Py+S4Ai7RGDrtv0R6/NPGgI1cBFmQ+6mJNPTw6L3pB81 TkzVege4loOfAAPe58GpNghAyYCL4Evw3/mwUFXipW8q1ElkNmXYHiZfbyz+BC5wsEXU Kx4aapkBud2I2gPAUUPtNgLsBBA3e52SL/bIP4HyNn98LhSMYxRPgRmKoAopDmw0vK72 UOoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782441; x=1785387241; 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=LJuHQA4AENaPcuIoY4pYQA3muOxiEnEKnbdN4NwUjpY=; b=C9NxneyJRBH8FsmQUxSMCh8oEO9W9q4Zh9z2y+9dfzCCMSfgPlEHo0c13XBAPw+q2+ Xbv88DhgADLVN2XccTcpdBs25uD/Mv9ytYAIszNYKQRUVjuutGaauPelOAJcvR2DRbIj 0Iclmol0bFeiSywlbAoCR3nerwRsbNHpX2HPuadhMnAqLQ3uMoLTFIf5W+JUl/Kt+tvD sNswU3xBrnJAoWCZWkzLBXpjPJE7oPuIWqJjkoEg/VSAJdlaWB6/jJ5XzoLZQuNKdWxt ePDDLhu3wbkBh/ti8fTdjZahgk4mPHqRUa4NFeiS2kIaELew6HCVsCdpGUS4PLZOhctO l2Pw== X-Forwarded-Encrypted: i=1; AHgh+RrCD1hFX0YtdBvhXNJsOieEOiQikYa/iT9Bgw/mvJwL4BXXLEN8xDpabNEv0xVfAFuuwIDIpOc1Q7dikX0=@vger.kernel.org X-Gm-Message-State: AOJu0YyiLZRsKUVdeeLRH2tkQaqCl0V4F1FzsSeKFyHsVqMDaIzzJrMT JfuFEqI91etXu4C1J6XJAe9NedilsvZB0pqrYKLNdzKczrPEAXczdg9q X-Gm-Gg: AR+sD13tiOeuXb38JgSOW+GwATDEdzKT0XdRc3vei4Q6OM+jH7GbROasIqt3TBReBLV O8kb0gLqbecAbNai3xcyAewmW+TI+r01xA9HTnfupvdMSUs8dyx0jy2b7T7VVdKFcRx8Y/1C630 J/xx9HwTZN1bYGJUeMgNBJbhJhX6iIoZ3NXDiIHqVuBvRwFsHRSvN+b9WIFY+oE8saP/rQ6OLey HmhcwlGsLEzKhof1gULk+zfm9N+mIGsj3ljJrRBZ1v6u7bUvYuqLafF6W9PxPF4en+5poIuNrrw ppb41jR1NuUoYQBuWF048/7nJgdEjbH+7LMQ+X0fsth98HFG36/jg4t/wG2ffwnWXWpz9Q6dzkj HZPoku1EAqCIi0SX26ZiEtlyzLNK0pRF2/6FML1BRirNGOvDdtECnEQl0rEyW1aGOCx4pk3Igd4 b40LthCyeqW114wUSPb8ybu3jqQH4Xw28I3kB8 X-Received: by 2002:a17:903:1a67:b0:2c9:97a7:71af with SMTP id d9443c01a7336-2cfa6f79cd1mr19036105ad.42.1784782440729; Wed, 22 Jul 2026 21:54:00 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:00 -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 02/26] ASoC: codecs: sta350: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:03 +0700 Message-ID: <20260723045327.28260-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/sta350.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c index 99c7f7ac807b..2ba35076732b 100644 --- a/sound/soc/codecs/sta350.c +++ b/sound/soc/codecs/sta350.c @@ -16,6 +16,7 @@ =20 #define pr_fmt(fmt) KBUILD_MODNAME ":%s:%d: " fmt, __func__, __LINE__ =20 +#include #include #include #include @@ -306,9 +307,9 @@ static int sta350_coefficient_get(struct snd_kcontrol *= kcontrol, int numcoef =3D kcontrol->private_value >> 16; int index =3D kcontrol->private_value & 0xffff; unsigned int cfud, val; - int i, ret =3D 0; + int i; =20 - mutex_lock(&sta350->coeff_lock); + guard(mutex)(&sta350->coeff_lock); =20 /* preserve reserved bits in STA350_CFUD */ regmap_read(sta350->regmap, STA350_CFUD, &cfud); @@ -320,24 +321,19 @@ static int sta350_coefficient_get(struct snd_kcontrol= *kcontrol, regmap_write(sta350->regmap, STA350_CFUD, cfud); =20 regmap_write(sta350->regmap, STA350_CFADDR2, index); - if (numcoef =3D=3D 1) { + if (numcoef =3D=3D 1) regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x04); - } else if (numcoef =3D=3D 5) { + else if (numcoef =3D=3D 5) regmap_write(sta350->regmap, STA350_CFUD, cfud | 0x08); - } else { - ret =3D -EINVAL; - goto exit_unlock; - } + else + return -EINVAL; =20 for (i =3D 0; i < 3 * numcoef; i++) { regmap_read(sta350->regmap, STA350_B1CF1 + i, &val); ucontrol->value.bytes.data[i] =3D val; } =20 -exit_unlock: - mutex_unlock(&sta350->coeff_lock); - - return ret; + return 0; } =20 static int sta350_coefficient_put(struct snd_kcontrol *kcontrol, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 96DFA3939B9 for ; Thu, 23 Jul 2026 04:54:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782459; cv=none; b=nu3SYojrIq5IMqrOH6yY9rNFIWzUNgGCB42eWq7q31qYHlylk0eTyR5zOeoamdGog0QVZcjbWl4zN+qyDeY/PSK1i7MwrhBJ7yWDQW2e74JV/thgI3pEhtSRL519BUfWf9FYTyDrwoz4bNSvfEI+6sAzlxK4x2qMhmvyrlJsmlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782459; c=relaxed/simple; bh=zFW9Mx0ZXn7hF454QrxJfQtGJ47S/hYdOGWLyBiXIRg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ouB10q7LwW1DjdgfWqnHA9HqfNTSnPix7AVcl618sWukHyKpkewx3hyuOn4sXfXnJjsNrHKiRykDCrunlH9oK9AkJVxO6Fsu7FRMdEacy7WE9Ii8hv2W+mp0QaKuGAyhRP+qh3h+WVusd5f7UW8CVuqMi4672XGJryGptr3wsb0= 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=QPt8o4oq; arc=none smtp.client-ip=209.85.214.182 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="QPt8o4oq" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2cad8076b01so3352715ad.2 for ; Wed, 22 Jul 2026 21:54:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782449; x=1785387249; 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=QPt8o4oqzuuKSoa5efoF5HOod045RJLqfKL8Tb3FPQl8W32S6xes/jwnAP1waARGxd 5oXYXOLzia4POVtfUOPy1rhRArgp32Ke+tL+05Ux23O36f75z9RaZM9CtPtNZQZKRY+m krdT7BFtE8SgEztcU6PYAyQcCIChv91fjpRil0FBGOT//HjXlFhwZQeJnf6+MujvZgd8 5VkJgRAUoy918scmJi4vl1wRCFw05/cZL/DbROHW+Hi+PYlr2BIkkn9wHzZ8/CoDcX5p pCJuBM3/5nBb4GRhgfj1Zx7/PobqN7xEd283BjE8O9imwTerbF78/ru+yghkjJUMehbC TplQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782449; x=1785387249; 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=H2yfTO4OKEldQtINVOeh7lVOHxRDbbpehwXY4qifYFllZbm1LAuEZERZmGWiN6s04d /q1LwWTQ3gE0nnxnXynNlgCRfrHyP0037eZj/1rGuG5YFLiVGZJjX8rJj3cZ5x7/YPjD ZpmYDbivV5E2SO2eXhbqgGuJBuN6W4MifQsJag/Hu2Eab71Gkh7TtPTHhnq/gDwBXHi2 bc7cM5RaSAygcDtHSc95749KO2EmOZDslWFCsJklPjhbB7iwiEg6FKe73CUDSghIU8Ch pa+IvYWBH/eZ3b0WC2Me0vfnpZEfeNV9akibG1Fk9SXUK3zaPWTq6F6IQpspTJm6Vou9 ib0w== X-Forwarded-Encrypted: i=1; AHgh+Ro0LaphQCFlUM6oCGpQ46cHKQLm68K3vtn1EuPZ+o7LqiAvbxkCbzy4Pw+9QmGmE2V5nzHITussEsj0HuI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7UfpwLI99k7go+r8j8d5YSI5efTn6GvItOMSvxJ/O2b0WisvL NqH6He+brRPA3LXZvO9Qhyn8rjLv+HcZX6FQmQ+DNvLkt0XWQFZceHYD X-Gm-Gg: AR+sD114Jr4d8FBsQBgcLZOuwCW59hualiBuvw5voSTviOUhavSSBjZ/7Nya7J0E+Ef +UBduvl1gMuroiMQp0l47zOPNbmZkSVv7YKgJuK4ryBaL+mVBjX6w6A4XEl0SRALY90Sm6fW8uj JjZ2o19WQWx0TQ3Dlvgt7W8NvYpt3tqvb8SY1w6D76u0R2cUYPyFFc0WiE0K8b6zIZL2u05c2YP TOGT7O9EHvzbbkF1Rxrfmrtu1U3GOrVTOdUoXjAgbPbNT6GqaWuLaVwOPMdiR/0zRuPdWxMP2l8 UxxXq3wekYWrKbI93biDpS3X+nuWtqLIuKMBq2bP3gVSRuG+JaFCwfN+rhU6kMbsodAumY4dkL2 bCKxPda+s84WK/09hjb9Kf2jR3M3F/G+hTwsuDtm2iEjtVCJ0C6PQmmwo+H+eBtOy66Kf+I738T Y3XkpvnXF7X06DcFlUXcWSKFV8MpLj+oAnAdID X-Received: by 2002:a17:902:fd8d:b0:2c9:97a7:3289 with SMTP id d9443c01a7336-2cfa752eae6mr19408995ad.43.1784782448675; Wed, 22 Jul 2026 21:54:08 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:08 -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 03/26] ASoC: codecs: sta32x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:04 +0700 Message-ID: <20260723045327.28260-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D kcontrol->private_value >> 16; int index =3D kcontrol->private_value & 0xffff; unsigned int cfud, val; - int i, ret =3D 0; + int i; =20 - mutex_lock(&sta32x->coeff_lock); + guard(mutex)(&sta32x->coeff_lock); =20 /* 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); =20 regmap_write(sta32x->regmap, STA32X_CFADDR2, index); - if (numcoef =3D=3D 1) { + if (numcoef =3D=3D 1) regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x04); - } else if (numcoef =3D=3D 5) { + else if (numcoef =3D=3D 5) regmap_write(sta32x->regmap, STA32X_CFUD, cfud | 0x08); - } else { - ret =3D -EINVAL; - goto exit_unlock; - } + else + return -EINVAL; + =20 for (i =3D 0; i < 3 * numcoef; i++) { regmap_read(sta32x->regmap, STA32X_B1CF1 + i, &val); ucontrol->value.bytes.data[i] =3D val; } =20 -exit_unlock: - mutex_unlock(&sta32x->coeff_lock); - - return ret; + return 0; } =20 static int sta32x_coefficient_put(struct snd_kcontrol *kcontrol, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 019E93939A4 for ; Thu, 23 Jul 2026 04:54:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782469; cv=none; b=QfkbCnG5Mcj1Cj2KJt+/ZBREr3J6vB8zJkzL9oXxGtN3GWsAueVgNPgV/7W4kHdRkD8/ZPumpwWTO3/2Ugi6SDw7DX4TzgrWBZd80Fe+ymx/KiMgP4w9qmHL7SyXnFP4DDW7fSRHh2aLdkGZ8lfx2zQ01hGUoCImelA1U9ehOg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782469; c=relaxed/simple; bh=y5XdJ6OkHgxu+beAwr5WwIRuGIeclzsWyl1XJ6BLy9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rubYAq2srqc6IdminOjeGsVSLlLxxyVSt/ji3xnGzIZcllTqQJfTGAIQ5Mso6Y+AOA+SeSff2EQv4dUBAWhCSGIwv8M96u6iFkGQz7h61bUwR9DZ0sDva0r3ffDdX22hiC+xjjL3bnnp5xLX/bTj9LoCO55PCau7qcrv0FFruqs= 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=MUzre2Tm; arc=none smtp.client-ip=209.85.214.181 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="MUzre2Tm" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2cae1a3a744so1676955ad.3 for ; Wed, 22 Jul 2026 21:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782456; x=1785387256; 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=2nJcxVapbgHVBOEWq/X49W5vkvWx4XNnEmWY18iJdtM=; b=MUzre2TmGO8l8YjfKzrPH/PeRuCS7kvnk6Jf3XwiNziFk3XcykL6Z6nAljju6kr0vW wO4ovAiqyUTu7qsbqnEHWnb/M1MrxezI6zAzxYx4jJfYpn4+lowZ4nGqj3iYhZWiIv/w fAlGXKzzPBBftyASL0A8VIu4da/uHLL8GK1VxTx8yenw+lAijrSyEngvh/TiQOt0eFHB ODCudE/bJkf6JqXxevQWv6m6d2sLtKtSe7unCWAmpEZU79Cmye3E4pIvuxqlMRfSwjN6 8SDqcwklyeNXUdRavIW/j7PlQ5bKSU+JsrsGcoFul4RAXI4z4CGU7gvnkXPCjvSmQnph nyEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782456; x=1785387256; 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=2nJcxVapbgHVBOEWq/X49W5vkvWx4XNnEmWY18iJdtM=; b=CBOs/PWuGzltU3zYV0iNvQNU5shhWi8aBvtKklDBZZbp2DwDjG6rA5oj8BfAFlQ7B0 54dauOjlisq/pwWJCg70K3HG7aMTQCAJ7jObm9rdPDwqh73gbng75wP8F9pELREIcw6c yrJZn4SC1c3A5GhmVNfwy13kVJ34eB6aGOokaUlO7/5E/ebVdye+cjzHj39BTspo7GwP m/4+k+nWohIA9tjZKYkwr6tG3HQL38g0RdVee1/TTLejW3U4wE3AKD5nL+DojXzT+gDj 71/scqtufhapEr0HyQn7EMq8yO0pXwe+NXwH8NOr6KkW/SNJOtCuZQSpMSNx0Hnd1PpA CPdA== X-Forwarded-Encrypted: i=1; AHgh+Rp9Jhvd33tJmwxR4CrByzLT9czahVZQkNHf6DPA1G0a2oyanCRh3ONA7QrmE6GvHak6/ZmWgnZ5PKZiGLE=@vger.kernel.org X-Gm-Message-State: AOJu0YwfIZw50ffMtFfIsMNg3/eAhd9CezeDGGNvW+4SfAweP4WgbXsw ppq0vYR57wfDqM2Vwgiv7RsBJlumWqmBHP2D8E28DOFeIRmpe5wlL8JN X-Gm-Gg: AR+sD10e2/urk6jel/j/2dzQrKDgGyBWTDwAIPBrct0UccVednFL1L3ZM1JGpbJNxTg uiPRS+P0Cb+3+4MWHNoTA5L694Z3GuKkOx0AgIsG1zDCfjh6K5CtJLaebOctbDIvSlRooj1utPU SNII+YORr0/VtaJzb+iHt617CBvQ0PDf/sju01Q9wbDi4rM/Bm18e3ofpJY3fnVmuFThXvMwGKD buRRRDI4nd0Tt75n6c31Wkt2aKM0bdTWKHKBQM224rttcA3kbL/+ybMp0NIBYQwKc08yzpYBvUf m2AYncmvednJSUjt2VzeKi9zQBsx0ONsLXI2dkqd/WTbq2l/nsuUXI8SWYi3Im7dUqy9R1P47rC zz+YWFbnRElpNv4JRmnLcG4ZMzb8xZVRT9acy1yuVAzOxLgiMTUv6aNF4iOkZchldCY637XG22F sM14X1J1Lt1B/C9BZ8QQT8ZE//CH9+TO2KdmUg X-Received: by 2002:a17:902:e74a:b0:2cf:1536:3d41 with SMTP id d9443c01a7336-2cfa74e3c3dmr19166495ad.28.1784782455846; Wed, 22 Jul 2026 21:54:15 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54: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 04/26] ASoC: codecs: tas2781: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:05 +0700 Message-ID: <20260723045327.28260-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tas2781-comlib-i2c.c | 5 ++--- sound/soc/codecs/tas2781-i2c.c | 32 +++++++++++---------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/tas2781-comlib-i2c.c b/sound/soc/codecs/tas27= 81-comlib-i2c.c index e24d56a14cfd..79b5f5b04c74 100644 --- a/sound/soc/codecs/tas2781-comlib-i2c.c +++ b/sound/soc/codecs/tas2781-comlib-i2c.c @@ -6,6 +6,7 @@ // // Author: Shenghao Ding =20 +#include #include #include #include @@ -342,7 +343,7 @@ int tascodec_init(struct tasdevice_priv *tas_priv, void= *codec, /* Codec Lock Hold to ensure that codec_probe and firmware parsing and * loading do not simultaneously execute. */ - mutex_lock(&tas_priv->codec_lock); + guard(mutex)(&tas_priv->codec_lock); =20 if (tas_priv->name_prefix) scnprintf(tas_priv->rca_binaryname, 64, "%s-%sRCA%d.bin", @@ -360,8 +361,6 @@ int tascodec_init(struct tasdevice_priv *tas_priv, void= *codec, dev_err(tas_priv->dev, "request_firmware_nowait err:0x%08x\n", ret); =20 - /* Codec Lock Release*/ - mutex_unlock(&tas_priv->codec_lock); return ret; } EXPORT_SYMBOL_GPL(tascodec_init); diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 9e6f0ad5f05d..16dd0989e5e2 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -13,6 +13,7 @@ // Author: Kevin Lu // =20 +#include #include #include #include @@ -843,12 +844,12 @@ static int tasdevice_digital_gain_get( unsigned char data[4]; int ret; =20 - mutex_lock(&tas_dev->codec_lock); + guard(mutex)(&tas_dev->codec_lock); /* Read the primary device */ ret =3D tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); if (ret) { dev_err(tas_dev->dev, "%s, get AMP vol error\n", __func__); - goto out; + return ret; } =20 target =3D get_unaligned_be32(&data[0]); @@ -868,8 +869,7 @@ static int tasdevice_digital_gain_get( /* find out the member same as or closer to the current volume */ ucontrol->value.integer.value[0] =3D abs(target - ar_l) <=3D abs(target - ar_r) ? l : r; -out: - mutex_unlock(&tas_dev->codec_lock); + return 0; } =20 @@ -882,29 +882,26 @@ static int tasdevice_digital_gain_put( struct snd_soc_component *codec =3D snd_kcontrol_chip(kcontrol); struct tasdevice_priv *tas_dev =3D snd_soc_component_get_drvdata(codec); int vol =3D ucontrol->value.integer.value[0]; - int status =3D 0, max =3D mc->max, rc =3D 1; + int status =3D 0, max =3D mc->max; int i, ret; unsigned int reg =3D mc->reg; unsigned int volrd, volwr; unsigned char data[4]; =20 vol =3D clamp(vol, 0, max); - mutex_lock(&tas_dev->codec_lock); + guard(mutex)(&tas_dev->codec_lock); /* Read the primary device */ ret =3D tasdevice_dev_bulk_read(tas_dev, 0, reg, data, 4); if (ret) { dev_err(tas_dev->dev, "%s, get AMP vol error\n", __func__); - rc =3D -1; - goto out; + return -1; } =20 volrd =3D get_unaligned_be32(&data[0]); volwr =3D get_unaligned_be32(tas_dev->dvc_tlv_table[vol]); =20 - if (volrd =3D=3D volwr) { - rc =3D 0; - goto out; - } + if (volrd =3D=3D volwr) + return 0; =20 for (i =3D 0; i < tas_dev->ndev; i++) { ret =3D tasdevice_dev_bulk_write(tas_dev, i, reg, @@ -918,10 +915,9 @@ static int tasdevice_digital_gain_put( } =20 if (status) - rc =3D -1; -out: - mutex_unlock(&tas_dev->codec_lock); - return rc; + return -1; + + return 1; } =20 static const struct snd_kcontrol_new tasdevice_cali_controls[] =3D { @@ -1766,12 +1762,10 @@ static int tasdevice_dapm_event(struct snd_soc_dapm= _widget *w, int state =3D 0; =20 /* Codec Lock Hold */ - mutex_lock(&tas_priv->codec_lock); + guard(mutex)(&tas_priv->codec_lock); if (event =3D=3D SND_SOC_DAPM_PRE_PMD) state =3D 1; tasdevice_tuning_switch(tas_priv, state); - /* Codec Lock Release*/ - mutex_unlock(&tas_priv->codec_lock); =20 return 0; } --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 E085D3909A2 for ; Thu, 23 Jul 2026 04:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782481; cv=none; b=c3h5UgTJ6Q3al5Ure4Wwz32fQ5thZSzB8cWreV40ep1jowahNXL4Fa24UpKavfFIG3GzMr4/F+55PgH+0zZ/KG9HtRjWhYvOIFjduSBEiYK4GDL6Z8GNNxk9DjMmwrXU37sgkRQWWkwHXkLMAxAJeB0gKxZV1OAlDp7o/Mli1HQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782481; c=relaxed/simple; bh=CR/lpIz867Ge5SfVg0BgnctkBifwpEVSwmWaNcKvrvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S4RX6PzoR1iTxJIOg5DNHSoc5DRZ/yB60lLsuxaa5IMccoAiCEbgDFgOff2vKHZdoCSSiXwqttirjlGVNvSgfrid5s9uZxQz+fsNQt2uKc6Tm7H01Q85ySKZCSvpoP5Wk9y8zYM7cORDGulSHt8d/qSyOKqJ/Jh14BLsMtNWPBs= 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=Pw/3XqPF; arc=none smtp.client-ip=209.85.214.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="Pw/3XqPF" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso2552725ad.2 for ; Wed, 22 Jul 2026 21:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782463; x=1785387263; 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=tK2T+D6HuV5arLji/rG4gtI0GorQ1z1dx7hf11H1P5k=; b=Pw/3XqPFoTiFe4SFQBGEiZM3z8neaVT4CZQNKPK07TQpXdwZ8RuQ4+lbh2WLI8Jc1u +Qra2i3J3pBNWarngdIHP73tXTe8NGXp/M/WNerL4wG6ZimWvsCmchGooU/wl9zeMn/e l2A1VJeLhC/Wxbd35vXj31/IUaUv4jH27GmbBxcw7g1u1mn/PjP18CXvQi1Zx6i1cteh WIw0N8A0mwCdcDWjGPqyaXiryPlxK+hXBuPZ3hf03h1nRXIT/yB2jqloeJZllBOLgS/i DHE16RhuO+LasnS2FSjY9Df9bAfCGCRDqV8CT1KZW/1+5XwdwpJ5Vw70Ri7J8AfNG5hc pC/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782463; x=1785387263; 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=tK2T+D6HuV5arLji/rG4gtI0GorQ1z1dx7hf11H1P5k=; b=lT46ZdpS9uAhF7+0ntgF190ieWDTXK0FskAgC+7udOeHTG/wSuO1CiSD9m+YnA0wrT 37erd/gV+rUCsaBdiJmugPDCHBIDDtHlY2LbB0nQQwjgh7SEDoHr7BejumTlg5x2Qtyq e260nkqmoy1hv7D02jIaX/JyeSUbhdHsnZUld9MxNhCWET53kFcGSNojsUZ6g+7efvsq rwV1lfDKHIKMuBW2XNrGo3z22ww0ho6C9c33VfGZD7iphP9Y1nw1PUgtm9ysuGuD2kpt FywAjE+cg4gVCZZ30plNbUF6iJxcJKqeUsgF+4+V6PaylXso7aTA53Ifv/YPcvDfeWvj yr8Q== X-Forwarded-Encrypted: i=1; AHgh+Rod/5rX9gG7zPqDs31qCQiDb2vgIueO0coww/jjl7ROtX9Ea8xBZHL+anqYEnAVB/PcGEZWReFzqIussec=@vger.kernel.org X-Gm-Message-State: AOJu0YzuB0z1BkRpIHKN+XOwRQvmUSLvS68oyIzHAZbZaQRlCz10lS4k uNNMoLSW3RYVCxBSELUM0IRKjcl/lvTXrSMsC0fzhF4veI+7ibsltoAS X-Gm-Gg: AR+sD11nAO02Be0GVQGjFEaaHE8gqCKnyBeX7yz97B8v+xyA1QivVneydRdI1NBXdwA DZi+PC37q6XYKOahRCVn+c3AQmqqBdRZPCYSgb7qY9gwutd9xoeFzkPYtDeMSAen0bEFZZjzj5f 3xdBs7qssiPAGMLqzATP0odYMAj1pQQ713SO7vQysJlgHtoNMgFFZHS1NXpk8PuiyroeYUJiq1T ZoTD4fDXNUqVjq8nKTGxL7MH1ecVXJjUsx6RLFfR4P47AOKZ5dLUEQ2H1ahCpL9H/sMXBtp3PGj ncZkQkhkx+cSHNpnbEx0rpH8KQhci3K2U37hs7HHJQr8lkLxSIDOGN97DbkkyvxzTDlxN4dPo8u pejlKWrH28cosZnYKgJMD7EQ3T+koaqA23LscJc+SkzB7e8go/loju2Hu//fCUCj8skxq+4ACO2 rQ9VVoFbE+sKqIB6+rRV+7w41BO9G0JlOGkqPa X-Received: by 2002:a17:902:d491:b0:2c2:62ee:5a0d with SMTP id d9443c01a7336-2cfa6b77547mr21765715ad.14.1784782463491; Wed, 22 Jul 2026 21:54:23 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:23 -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 05/26] ASoC: codecs: tas2783: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:06 +0700 Message-ID: <20260723045327.28260-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tas2783-sdw.c | 60 ++++++++++++++++------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/tas2783-sdw.c b/sound/soc/codecs/tas2783-sdw.c index db58c50e8a83..8ebed797acb5 100644 --- a/sound/soc/codecs/tas2783-sdw.c +++ b/sound/soc/codecs/tas2783-sdw.c @@ -12,6 +12,7 @@ // Author: Baojun Xu // Author: Kevin Lu =20 +#include #include #include #include @@ -693,12 +694,12 @@ static s32 tas2783_update_calibdata(struct tas2783_pr= v *tas_dev) return 0; } =20 - mutex_lock(&tas_dev->calib_lock); - ret =3D tas2783_validate_calibdata(tas_dev, tas_dev->cali_data.data, - tas_dev->cali_data.read_sz); - if (!ret) - tas2783_set_calib_params_to_device(tas_dev, tmp_val); - mutex_unlock(&tas_dev->calib_lock); + scoped_guard(mutex, &tas_dev->calib_lock) { + ret =3D tas2783_validate_calibdata(tas_dev, tas_dev->cali_data.data, + tas_dev->cali_data.read_sz); + if (!ret) + tas2783_set_calib_params_to_device(tas_dev, tmp_val); + } =20 return ret; } @@ -927,22 +928,23 @@ static s32 tas_sdw_hw_params(struct snd_pcm_substream= *substream, dev_err(tas_dev->dev, "clear latch failed, err=3D%d", ret); =20 - mutex_lock(&tas_dev->pde_lock); - /* - * Sometimes, there is error returned during power on. - * So added retry logic to ensure power on so that - * port prepare succeeds - */ - do { - ret =3D regmap_write(tas_dev->regmap, - SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, - TAS2783_SDCA_CTL_REQ_POW_STATE, 0), - TAS2783_SDCA_POW_STATE_ON); - if (!ret) - break; - usleep_range(2000, 2200); - } while (retry--); - mutex_unlock(&tas_dev->pde_lock); + scoped_guard(mutex, &tas_dev->pde_lock) { + /* + * Sometimes, there is error returned during power on. + * So added retry logic to ensure power on so that + * port prepare succeeds + */ + do { + ret =3D regmap_write(tas_dev->regmap, + SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, + TAS2783_SDCA_CTL_REQ_POW_STATE, 0), + TAS2783_SDCA_POW_STATE_ON); + if (!ret) + break; + usleep_range(2000, 2200); + } while (retry--); + } + if (ret) return ret; =20 @@ -966,7 +968,6 @@ static s32 tas_sdw_hw_params(struct snd_pcm_substream *= substream, static s32 tas_sdw_pcm_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - s32 ret; struct snd_soc_component *component =3D dai->component; struct tas2783_prv *tas_dev =3D snd_soc_component_get_drvdata(component); @@ -975,14 +976,11 @@ static s32 tas_sdw_pcm_hw_free(struct snd_pcm_substre= am *substream, =20 sdw_stream_remove_slave(tas_dev->sdw_peripheral, sdw_stream); =20 - mutex_lock(&tas_dev->pde_lock); - ret =3D regmap_write(tas_dev->regmap, - SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, - TAS2783_SDCA_CTL_REQ_POW_STATE, 0), - TAS2783_SDCA_POW_STATE_OFF); - mutex_unlock(&tas_dev->pde_lock); - - return ret; + guard(mutex)(&tas_dev->pde_lock); + return regmap_write(tas_dev->regmap, + SDW_SDCA_CTL(1, TAS2783_SDCA_ENT_PDE23, + TAS2783_SDCA_CTL_REQ_POW_STATE, 0), + TAS2783_SDCA_POW_STATE_OFF); } =20 static const struct snd_soc_dai_ops tas_dai_ops =3D { --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 D2FD2360EF7 for ; Thu, 23 Jul 2026 04:54:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782479; cv=none; b=HO16Vbov8tMmQnidRsM6uikcBShJcs8LWx3iVnjzboJcF4mfV4LQhC6ufP0uOORFDX4bisrkA76YYQP0XPiCDCsZMEc/3PC5JbkKrandcpZMizyt9Ne5hxS0sgMKuDBto9CBVj1ln9l/U5M0aL8YAu3OgAvsQIQnZ8aPPOY3dbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782479; c=relaxed/simple; bh=jJta1wP6Gxka/gvOOEwLo5cIEFpwWGZWGRX7SMxpNTs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXF4l885rmv1b43KCMi8PJcRhwG/J9ERqdefCUsM/hKahTgwgKQpj6PUcoury9b/fUFKYNrsWdU1Ut+Hy5CYR1jcJLlgtVvMQGOfZc9+hcfLFGcLwYPdtGsR56t9wh7vrUf7nr5TV0gIZFYUSMxfkhQWOdpVWhXNVreUTRbUK7I= 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=lXL7602S; arc=none smtp.client-ip=209.85.214.177 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="lXL7602S" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2ceb096e675so2709725ad.0 for ; Wed, 22 Jul 2026 21:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782470; x=1785387270; 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=GJN91k1ihxweTvZ2euRdyyI5ivn2nMtlaxC9t7yRgHQ=; b=lXL7602StTcqlCMOIO+t8C+pB8OKPkJ4SyYxBZZ6vgyHfcwpD1k+GPj6T/Qj8YAQzu H3t+DKTdP5Vd7aHHPJ3msyyui7FLlq+2DbKEkMKqSSDTFBzfxCkRCzKa9Y7Q1IkGl0PU J5BboR/YjV6Lc37T0RWaJmi2V3oUIQwbOgNt2xbx7Ody0rw1qxsapKQsN//rgz46PCnu EYbSl+V+vhDS9CFowy9MRdIoADtnrCj1eEGv9/58BUVhh7PaSo3U1C1BOeUeiC6I2+9x tzZIpg1n8N/NQsixyVFmDbapaYefH2cMLqNGHC/cwHIMTH9fdf0HLI7aDbe4uqkZ3x7R rB4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782470; x=1785387270; 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=GJN91k1ihxweTvZ2euRdyyI5ivn2nMtlaxC9t7yRgHQ=; b=PcrumrCJrftRYMn+99oCn3r3m055uqqa1alDwKGBwHwRgzbwScuqbMUsK2fKAVayT6 SJdryFfhmP9+c86F4pPZbc98//yLPA/PuzdM5YoUQP2glNUvMcFn0c7VAib5YuhxgR8K gg0smBv5hnFsoiFo/20LQAIAMZnIhSAcCSIXjfYyELOM6+0dttsou9EMZ1SGOx2De9t9 YNlo9LzslXpLsNUAiZRc0Fo4ChdmKIyhgO4eMjfByPRb/hSTRvT65O8lTD3bEk5616S8 IOjUP5G96peIQHzauyr3btBAorFZ+Eu3F+PTjhmy5It9diCLRfqahV/yxqgCRew3xavs 3UhQ== X-Forwarded-Encrypted: i=1; AHgh+RpvF8G8VA7vi2vhQBHyNhnL4yON24XsQ/rrdnsZfWzsPKyyJkwu4QInpGytv8VJkGEIIvZcmpvlrdjEpRE=@vger.kernel.org X-Gm-Message-State: AOJu0YzHc525+x6p+NH6MxLM68oI7r0NEFC/788bToiRp2m+mgKwrw78 yZQ+i2YBwoHmMbe6U8LGPtkAa11osVNBc/UZs2Hn5xY5rei3yiGZDohw X-Gm-Gg: AR+sD12z4JkDTd2vXPHrqC2c20vmk/MQApDvNgYoVBUxABoVUDR+9mqiFABGBFpRUu1 58eRrc/OTxhRltMWBTEW2PUGD1HPcORbtGsMQy/SwDS3ocsVlt81OwNl1CKqZVfVy/Iv8bVuTwR FhKhGFgqr/0iupA/xY7IrQ8mPURmNLzcG8CSXWBmrCYMOKiu3QXqL1OBMfdlKZtZpEwh2cCPrpo HxuQbd48BdJQell59aFWb7M4yHvuWQBk90PXaMzVS3MKLmLEjEmqT9Ct9XRGRdxYEDDhp5ajGA+ V3DTlTJVIvSyeXEjiR8TPx+l/fw2IYhMPe8on0TZB0F0rugmUxjUtPscAZq36vcDggHPdSmRxi6 ymEhGlhM1tdr54Whlacqn45zo34GNDicNr6cWIYSjgeMXi+LqhaReAdML4hLUhBK5pKepJkd+Qm uhmOp7/Lsdcf3EoTuDlrqyTdyqbAqtFX2iO6XP X-Received: by 2002:a17:902:ecc4:b0:2cc:9473:97c8 with SMTP id d9443c01a7336-2cfa6b7dbbemr19302125ad.15.1784782469929; Wed, 22 Jul 2026 21:54:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:29 -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 06/26] ASoC: codecs: tas5805m: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:07 +0700 Message-ID: <20260723045327.28260-7-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tas5805m.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index bcc8cab8d667..f76e04b403b5 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -12,6 +12,7 @@ // // It has been simplified a little and reworked for the 5.x ALSA SoC API. =20 +#include #include #include #include @@ -230,10 +231,9 @@ static int tas5805m_vol_get(struct snd_kcontrol *kcont= rol, struct tas5805m_priv *tas5805m =3D snd_soc_component_get_drvdata(component); =20 - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); ucontrol->value.integer.value[0] =3D tas5805m->vol[0]; ucontrol->value.integer.value[1] =3D tas5805m->vol[1]; - mutex_unlock(&tas5805m->lock); =20 return 0; } @@ -249,13 +249,12 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcon= trol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct tas5805m_priv *tas5805m =3D snd_soc_component_get_drvdata(component); - int ret =3D 0; =20 if (!(volume_is_valid(ucontrol->value.integer.value[0]) && volume_is_valid(ucontrol->value.integer.value[1]))) return -EINVAL; =20 - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); if (tas5805m->vol[0] !=3D ucontrol->value.integer.value[0] || tas5805m->vol[1] !=3D ucontrol->value.integer.value[1]) { tas5805m->vol[0] =3D ucontrol->value.integer.value[0]; @@ -265,11 +264,10 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcon= trol, tas5805m->is_powered); if (tas5805m->is_powered) tas5805m_refresh(tas5805m); - ret =3D 1; + return 1; } - mutex_unlock(&tas5805m->lock); =20 - return ret; + return 0; } =20 static const struct snd_kcontrol_new tas5805m_snd_controls[] =3D { @@ -332,7 +330,7 @@ static void do_work(struct work_struct *work) =20 dev_dbg(&tas5805m->i2c->dev, "DSP startup\n"); =20 - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); /* We mustn't issue any I2C transactions until the I2S * clock is stable. Furthermore, we must allow a 5ms * delay after the first set of register writes to @@ -345,7 +343,6 @@ static void do_work(struct work_struct *work) =20 tas5805m->is_powered =3D true; tas5805m_refresh(tas5805m); - mutex_unlock(&tas5805m->lock); } =20 static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, @@ -362,7 +359,7 @@ static int tas5805m_dac_event(struct snd_soc_dapm_widge= t *w, dev_dbg(component->dev, "DSP shutdown\n"); cancel_work_sync(&tas5805m->work); =20 - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); if (tas5805m->is_powered) { tas5805m->is_powered =3D false; =20 @@ -379,7 +376,6 @@ static int tas5805m_dac_event(struct snd_soc_dapm_widge= t *w, =20 regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); } - mutex_unlock(&tas5805m->lock); } =20 return 0; @@ -414,14 +410,13 @@ static int tas5805m_mute(struct snd_soc_dai *dai, int= mute, int direction) struct tas5805m_priv *tas5805m =3D snd_soc_component_get_drvdata(component); =20 - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); dev_dbg(component->dev, "set mute=3D%d (is_powered=3D%d)\n", mute, tas5805m->is_powered); =20 tas5805m->is_muted =3D mute; if (tas5805m->is_powered) tas5805m_refresh(tas5805m); - mutex_unlock(&tas5805m->lock); =20 return 0; } --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 C7EB9396572 for ; Thu, 23 Jul 2026 04:54:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782488; cv=none; b=tP916WpLG0PltOwTM4jxSuTfiqrN0wYVi2YZn0W/0uf6iA3evKA493b+DAH0b+EKgQMnAtcFaeZIS0t0TN8qY9sFdak9hPOQlnbE0WVfMJfGc8M6P/z/EchuGDnuvT8ImR89R6rGSUY4wXLn26QljJ0kJjG7t9ZMJXSozpEIbBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782488; c=relaxed/simple; bh=4P3qOSBkZIQJD0dP/avNyHuYesAgPsaLhYxvXxAmErk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NQLo5GNM/UjdQfDr6b/3VzSVLId3iNuRdMn3kuZ2q1+oFasslkF97rfyVpNGxH20u17O85aKdmxlft7KeSGM1lNzszH03iE4/H1J9sbBwlTMcj+Qf+6q/33SMcAiygpB4ly8z6Z7eQRp/vi4NWkY56tMUxoUfXNe5IG0bnPO9BI= 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=OmvBMVy9; arc=none smtp.client-ip=209.85.214.175 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="OmvBMVy9" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2cf41bab353so3087915ad.0 for ; Wed, 22 Jul 2026 21:54:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782476; x=1785387276; 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=HMaTaVppxtdBT/aFQQkrTJ9dhpXa6DmRNwQ/jLrNZ78=; b=OmvBMVy9V5TiEGNXfQNRj7fuQ6Uc1ts7SkN8jD9SpOI4z05HlOSqyspqZJmTbcmimC wACYvKw1MlMmJItyRfSGLLOX12dNGbg8Wp/sBeQX6nl2d6pZ0Mm3BW8VeZ+2i5E4Ck9M NZSkdiVvKRzUBcm7z7gPBMZBFGZH70RQ5ZUlMPMb+vv8F5tUoJ0v5+a+A1uqrJKpvxjT HAnmuCTBxR329wgHo5Qm/hrYDuysWdKUWozc1uRkWM0s5VP1Oq0rway1S1qulo6HYagU 1YiZTR2IwBdhmQnE+QjTLSsSRrQhHTRxTwECJCIl1BBI91bE1bUmVENV2ByEGTEaXPg0 nvig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782476; x=1785387276; 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=HMaTaVppxtdBT/aFQQkrTJ9dhpXa6DmRNwQ/jLrNZ78=; b=LPRCErt52/vGQQMIsgo49tjcFBOfPRcF5Bxv6vc14oHoYXOPWzGA60RKK4gPGok/Dg CtjjvIbAeBh1qF/C+gFCVyycyiHMrfOBibJdCpYfh7Nzk7OJ290qhHJZkPoKvjeu5BFt YgeCDkp08nr++N0lD3FpIrKs5oY6Pqz3aJs1ekWDTEahXR7hPdRUEtfTtN53FAMuvGq6 VmwGewMiPyUfolSAj16MX3SWRrsvwJR+WA4CHsGNergltsmZySDae1cs7taWI4eBznw5 ANIqEfXnOPcLSLBqvPAv169Kf8odJc2Gi5ysjqSJ0k8xYYzdQ5IXe4skiasam6GJHRBi jOlQ== X-Forwarded-Encrypted: i=1; AHgh+RoDhv/+aGcxfwqUgdQXQbtMwuyRNWYqFwHDjRI9X8vCjVvgsMUeoKusy6lWlLfSA2b1THL2xcr3/vDeWHA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh6XhMRqGIOVdl64eUd1o+bdkMccOqVhk7DfkRbcdOpOUwoAEz harwDpJjHzXBUPxbiZHBm85Q/kkPqedKezw0jLwAf9rw1Qfe4hbuLin4Z1Mskg== X-Gm-Gg: AR+sD11KmErpYHA4YtlbFzmrFy6i64GSV5EmQQhMonE9/jgbe8JxhWMGCrortTLhZCJ zT+ovxSeXkzxmJGGgqgPBHaeL1tuLqQYJFGAxVT6s9PDtn1Htxh7XThmS9fLPesjmISGiYlfmsc +xGjPwbjd45EuTmf+r/EcRLJRlOofLrjpaQ6GS7O2Uib4Rc6j0sgYi7+hevF9vw31n2VgQGJToh tXrFfN7JGDhswiL98XecwPeReiD5LSaDnpLvk10gCair5iVZV5YOPZO2In5mgTgBgGzwU7W3zNy Qzg//6yXW1+pTKSENd67XMIzsiv+9XXTegyboH1LPf3MqzngoWLzKSVpb8rwkdahU7EEGHh7lf1 p0XJkK+t5t6wqJJfnygDxRdIq3yjXdSDXpOqKjuViLnYBmAwOg3qnRZ95zlxPXJe1Azkq5m+E6R Z0hqV8vGxsO0Z/6ePBgLnvB8bfSdP4R2HEJ4J+ X-Received: by 2002:a17:902:d54c:b0:2ce:7563:70a5 with SMTP id d9443c01a7336-2cfa71b8455mr23823955ad.6.1784782476199; Wed, 22 Jul 2026 21:54:36 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:35 -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 07/26] ASoC: codecs: tlv320dac33: Use guard() for mutex & spin locks Date: Thu, 23 Jul 2026 11:53:08 +0700 Message-ID: <20260723045327.28260-8-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for mutex & spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/tlv320dac33.c | 87 ++++++++++++++-------------------- 1 file changed, 36 insertions(+), 51 deletions(-) diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 223c49dfc450..9bd2ddd8dacd 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -7,6 +7,7 @@ * Copyright: (C) 2009 Nokia Corporation */ =20 +#include #include #include #include @@ -236,13 +237,10 @@ static int dac33_write_locked(struct snd_soc_componen= t *component, unsigned int unsigned int value) { struct tlv320dac33_priv *dac33 =3D snd_soc_component_get_drvdata(componen= t); - int ret; =20 - mutex_lock(&dac33->mutex); - ret =3D dac33_write(component, reg, value); - mutex_unlock(&dac33->mutex); + guard(mutex)(&dac33->mutex); =20 - return ret; + return dac33_write(component, reg, value); } =20 #define DAC33_I2C_ADDR_AUTOINC 0x80 @@ -365,13 +363,13 @@ static int dac33_hard_power(struct snd_soc_component = *component, int power) struct tlv320dac33_priv *dac33 =3D snd_soc_component_get_drvdata(componen= t); int ret =3D 0; =20 - mutex_lock(&dac33->mutex); + guard(mutex)(&dac33->mutex); =20 /* Safety check */ if (unlikely(power =3D=3D dac33->chip_power)) { dev_dbg(component->dev, "Trying to set the same power state: %s\n", power ? "ON" : "OFF"); - goto exit; + return ret; } =20 if (power) { @@ -380,7 +378,7 @@ static int dac33_hard_power(struct snd_soc_component *c= omponent, int power) if (ret !=3D 0) { dev_err(component->dev, "Failed to enable supplies: %d\n", ret); - goto exit; + return ret; } =20 if (dac33->reset_gpiod) { @@ -388,7 +386,7 @@ static int dac33_hard_power(struct snd_soc_component *c= omponent, int power) if (ret < 0) { dev_err(&dac33->i2c->dev, "Failed to set reset GPIO: %d\n", ret); - goto exit; + return ret; } } =20 @@ -400,7 +398,7 @@ static int dac33_hard_power(struct snd_soc_component *c= omponent, int power) if (ret < 0) { dev_err(&dac33->i2c->dev, "Failed to set reset GPIO: %d\n", ret); - goto exit; + return ret; } } =20 @@ -409,14 +407,12 @@ static int dac33_hard_power(struct snd_soc_component = *component, int power) if (ret !=3D 0) { dev_err(component->dev, "Failed to disable supplies: %d\n", ret); - goto exit; + return ret; } =20 dac33->chip_power =3D 0; } =20 -exit: - mutex_unlock(&dac33->mutex); return ret; } =20 @@ -659,7 +655,6 @@ static inline void dac33_prefill_handler(struct tlv320d= ac33_priv *dac33) { struct snd_soc_component *component =3D dac33->component; unsigned int delay; - unsigned long flags; =20 switch (dac33->fifo_mode) { case DAC33_FIFO_MODE1: @@ -667,10 +662,10 @@ static inline void dac33_prefill_handler(struct tlv32= 0dac33_priv *dac33) DAC33_THRREG(dac33->nsample)); =20 /* Take the timestamps */ - spin_lock_irqsave(&dac33->lock, flags); - dac33->t_stamp2 =3D ktime_to_us(ktime_get()); - dac33->t_stamp1 =3D dac33->t_stamp2; - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) { + dac33->t_stamp2 =3D ktime_to_us(ktime_get()); + dac33->t_stamp1 =3D dac33->t_stamp2; + } =20 dac33_write16(component, DAC33_PREFILL_MSB, DAC33_THRREG(dac33->alarm_threshold)); @@ -682,11 +677,11 @@ static inline void dac33_prefill_handler(struct tlv32= 0dac33_priv *dac33) break; case DAC33_FIFO_MODE7: /* Take the timestamp */ - spin_lock_irqsave(&dac33->lock, flags); - dac33->t_stamp1 =3D ktime_to_us(ktime_get()); - /* Move back the timestamp with drain time */ - dac33->t_stamp1 -=3D dac33->mode7_us_to_lthr; - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) { + dac33->t_stamp1 =3D ktime_to_us(ktime_get()); + /* Move back the timestamp with drain time */ + dac33->t_stamp1 -=3D dac33->mode7_us_to_lthr; + } =20 dac33_write16(component, DAC33_PREFILL_MSB, DAC33_THRREG(DAC33_MODE7_MARGIN)); @@ -704,14 +699,12 @@ static inline void dac33_prefill_handler(struct tlv32= 0dac33_priv *dac33) static inline void dac33_playback_handler(struct tlv320dac33_priv *dac33) { struct snd_soc_component *component =3D dac33->component; - unsigned long flags; =20 switch (dac33->fifo_mode) { case DAC33_FIFO_MODE1: /* Take the timestamp */ - spin_lock_irqsave(&dac33->lock, flags); - dac33->t_stamp2 =3D ktime_to_us(ktime_get()); - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) + dac33->t_stamp2 =3D ktime_to_us(ktime_get()); =20 dac33_write16(component, DAC33_NSAMPLE_MSB, DAC33_THRREG(dac33->nsample)); @@ -735,7 +728,7 @@ static void dac33_work(struct work_struct *work) dac33 =3D container_of(work, struct tlv320dac33_priv, work); component =3D dac33->component; =20 - mutex_lock(&dac33->mutex); + guard(mutex)(&dac33->mutex); switch (dac33->state) { case DAC33_PREFILL: dac33->state =3D DAC33_PLAYBACK; @@ -757,18 +750,15 @@ static void dac33_work(struct work_struct *work) dac33_write(component, DAC33_FIFO_CTRL_A, reg); break; } - mutex_unlock(&dac33->mutex); } =20 static irqreturn_t dac33_interrupt_handler(int irq, void *dev) { struct snd_soc_component *component =3D dev; struct tlv320dac33_priv *dac33 =3D snd_soc_component_get_drvdata(componen= t); - unsigned long flags; =20 - spin_lock_irqsave(&dac33->lock, flags); - dac33->t_stamp1 =3D ktime_to_us(ktime_get()); - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) + dac33->t_stamp1 =3D ktime_to_us(ktime_get()); =20 /* Do not schedule the workqueue in Mode7 */ if (dac33->fifo_mode !=3D DAC33_FIFO_MODE7) @@ -902,14 +892,13 @@ static int dac33_prepare_chip(struct snd_pcm_substrea= m *substream, return -EINVAL; } =20 - mutex_lock(&dac33->mutex); + guard(mutex)(&dac33->mutex); =20 if (!dac33->chip_power) { /* * Chip is not powered yet. * Do the init in the dac33_set_bias_level later. */ - mutex_unlock(&dac33->mutex); return 0; } =20 @@ -1053,8 +1042,6 @@ static int dac33_prepare_chip(struct snd_pcm_substrea= m *substream, break; } =20 - mutex_unlock(&dac33->mutex); - return 0; } =20 @@ -1156,21 +1143,20 @@ static snd_pcm_sframes_t dac33_dai_delay( unsigned int time_delta, uthr; int samples_out, samples_in, samples; snd_pcm_sframes_t delay =3D 0; - unsigned long flags; =20 switch (dac33->fifo_mode) { case DAC33_FIFO_BYPASS: break; case DAC33_FIFO_MODE1: - spin_lock_irqsave(&dac33->lock, flags); - t0 =3D dac33->t_stamp1; - t1 =3D dac33->t_stamp2; - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) { + t0 =3D dac33->t_stamp1; + t1 =3D dac33->t_stamp2; + } t_now =3D ktime_to_us(ktime_get()); =20 /* We have not started to fill the FIFO yet, delay is 0 */ if (!t1) - goto out; + return 0; =20 if (t0 > t1) { /* @@ -1230,23 +1216,22 @@ static snd_pcm_sframes_t dac33_dai_delay( } break; case DAC33_FIFO_MODE7: - spin_lock_irqsave(&dac33->lock, flags); - t0 =3D dac33->t_stamp1; - uthr =3D dac33->uthr; - spin_unlock_irqrestore(&dac33->lock, flags); + scoped_guard(spinlock_irqsave, &dac33->lock) { + t0 =3D dac33->t_stamp1; + uthr =3D dac33->uthr; + } t_now =3D ktime_to_us(ktime_get()); =20 /* We have not started to fill the FIFO yet, delay is 0 */ if (!t0) - goto out; + return 0; =20 if (t_now <=3D t0) { /* * Either the timestamps are messed or equal. Report * maximum delay */ - delay =3D uthr; - goto out; + return uthr; } =20 time_delta =3D t_now - t0; @@ -1287,7 +1272,7 @@ static snd_pcm_sframes_t dac33_dai_delay( dac33->fifo_mode); break; } -out: + return delay; } =20 --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 CDB62396579 for ; Thu, 23 Jul 2026 04:54:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782498; cv=none; b=HbZdR8R+eMhYc3c8SNQ0eZ52Qs592l1NRvd3NWY9FShUUOwgkuu8Y9vDsqt+qxtTpf2ioQHMYxWL3HVCNaCXLo0hROz9n5qOtMId692BEdVstDt/DwaPSFGkuUg7xLwgvWgbLDOr7ClLv4ist54zh4nF42ZBUGcxU4TL4UU44jQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782498; c=relaxed/simple; bh=nZGVKfdU4GqxPhxmWCUGDD6Nc/KNfAjP7JAS+KPicHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p7eB3ifC/znsWcwKMUWzdvgWpmd01tBHVxC1OxhbBlp9D95LOSDNy8w/xH6adT0/uu6T/sx0SaKj7nxgjkdrrRzBSEMSRYerEJtrgVkrMV6gsgGbbx1369TNz4+mg6LPJicRFq/ZDH08is4zeA2m9ng0QeoWHhLTnFOYFcmyMWQ= 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=KbVIMY1i; arc=none smtp.client-ip=209.85.214.181 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="KbVIMY1i" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2cf52d15d88so2493885ad.2 for ; Wed, 22 Jul 2026 21:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782484; x=1785387284; 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=2URIyRhsqdkSXLbHXTDfJ+qkOeAaYtVPXldxW4D65fM=; b=KbVIMY1ixYi8TmFd6CWkRJcLP/1lbQq4BMl+r517aud6OtmakQyU6nytwF4xu1e6k5 rcg6/q58DqF2cEWIDE4PZYpQg3v4a0YWuZm5NWW1XRKJGvMgfmQJOMQemqrh+2W8r39V 4Jfr2lbbkVanW0A5jtCGYVva524QwFZF5kcWyVQcNNOm5cfhTayoB8qb8zUiB1GhcBv+ 3h/bB2MgNw2o7x5wuwdPkhXH8RgLoFBdt8hnZ/jiiW66l20iZz7PjFO4qrz1sbw81FPE MM0BkGyBCrcHI6/hourgFBAm10kvlentP/UUzMeKA7hDWyKgagh7VdxdW6SAyB0BPc0y VVFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782484; x=1785387284; 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=2URIyRhsqdkSXLbHXTDfJ+qkOeAaYtVPXldxW4D65fM=; b=QTcs4inujRzzlZJuO9+MuU1zk7V/WmnebOoTaEc32MVmB+0V/BgJqGbe5Ahi+4kX70 eEaMKoSIL1jPfdifyC6sYQm6UOpyN9ocBw1Tb6WaDklcoFRLoXi72SIT9mSQEDJQodV7 NEGxu/aXsm2dWFbY3nq43HwjoVr5o+SuzhtqNRk2d9S5u8CSJawvJswUe8GrZ/S/ibkr l94FIUmoFmvZYfQulZ0EM7QkuiAOefzTf7pAOJM1P+tNC6Q5YqqyasOoldoxzg7xXKaQ qmyeUmXygbifqaV8F3Sw3NVcTKZWBAy2FoAK1TpAPazSacOJC9nhF4mc6XdnGE66WiAA zgXA== X-Forwarded-Encrypted: i=1; AHgh+Rpdl3t7YMCEvcZzdBNlik/cHlmQfexRk42iqb+sfpYjrrU8SXtHVpq4YCKCV+xeKa3asqaySLOML1K1HOI=@vger.kernel.org X-Gm-Message-State: AOJu0YxXr6Aagd7QkxV//U6rDJsnG2m6jsWbn3ng0i45RUzpldXg4U9/ xTGqemKeNV6T6asocCpD8TeGKgmalyI7Pvc5sQF86i8e+ZgYetRG2x8Y X-Gm-Gg: AR+sD10p316t6h2iw+SIbrSWZeCZ3LsaWuUgJA64Dze7U3gVoe9bWh4124obOh+cobm ogt4YSsJPCqhj6cpKbAGS8hHSw3JIiV4kdYXaci26U/2xZaTXRsOAfNtqwJhnNvIBmSp3aIhh+W XwVnIriroyS9kbxcZ6cUuF/OafkgMMWnMezRg2n0Y8uhA6sP09998+i/pn9TdRCSFOBDNCLKypd KIiW08oGlFAW0pg/djMmHDKI2e8062INYvdPw0y+RyadjPUKPbw62/JCKVwMjSq6ORLeOARS1wL aE8a6lOIym+UTl1fjl0Rp0AfZzfflnkIl7JljSrrU2jWSFBGQE2nc3Xu+68ia2HpTKaKV45Mx/A 4dXJCnzd2F+9qUTaRz6EZwanjCCcVNBm25/FewxnT9QJUXKt5vHmuNmHFeayqo1hmL0fb2vgD4u eF4a3x8T/MaYiw4+pP0PimiRinjv0od3m70xAR X-Received: by 2002:a17:903:22c7:b0:2c9:ed16:8d8d with SMTP id d9443c01a7336-2cfa6d8797bmr19246355ad.38.1784782484352; Wed, 22 Jul 2026 21:54:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:44 -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 08/26] ASoC: codecs: tscs42xx: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:09 +0700 Message-ID: <20260723045327.28260-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tscs42xx.c | 61 ++++++++++++------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/sound/soc/codecs/tscs42xx.c b/sound/soc/codecs/tscs42xx.c index dba581857920..02082ef790b4 100644 --- a/sound/soc/codecs/tscs42xx.c +++ b/sound/soc/codecs/tscs42xx.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -210,25 +211,21 @@ static int power_up_audio_plls(struct snd_soc_compone= nt *component) return ret; } =20 - mutex_lock(&tscs42xx->pll_lock); + guard(mutex)(&tscs42xx->pll_lock); =20 ret =3D snd_soc_component_update_bits(component, R_PLLCTL1C, mask, val); if (ret < 0) { dev_err(component->dev, "Failed to turn PLL on (%d)\n", ret); - goto exit; + return ret; } =20 if (!plls_locked(component)) { dev_err(component->dev, "Failed to lock plls\n"); ret =3D -ENOMSG; - goto exit; + return ret; } =20 - ret =3D 0; -exit: - mutex_unlock(&tscs42xx->pll_lock); - - return ret; + return 0; } =20 static int power_down_audio_plls(struct snd_soc_component *component) @@ -236,28 +233,24 @@ static int power_down_audio_plls(struct snd_soc_compo= nent *component) struct tscs42xx *tscs42xx =3D snd_soc_component_get_drvdata(component); int ret; =20 - mutex_lock(&tscs42xx->pll_lock); + guard(mutex)(&tscs42xx->pll_lock); =20 ret =3D snd_soc_component_update_bits(component, R_PLLCTL1C, RM_PLLCTL1C_PDB_PLL1, RV_PLLCTL1C_PDB_PLL1_DISABLE); if (ret < 0) { dev_err(component->dev, "Failed to turn PLL off (%d)\n", ret); - goto exit; + return ret; } ret =3D snd_soc_component_update_bits(component, R_PLLCTL1C, RM_PLLCTL1C_PDB_PLL2, RV_PLLCTL1C_PDB_PLL2_DISABLE); if (ret < 0) { dev_err(component->dev, "Failed to turn PLL off (%d)\n", ret); - goto exit; + return ret; } =20 - ret =3D 0; -exit: - mutex_unlock(&tscs42xx->pll_lock); - - return ret; + return 0; } =20 static int coeff_ram_get(struct snd_kcontrol *kcontrol, @@ -269,13 +262,11 @@ static int coeff_ram_get(struct snd_kcontrol *kcontro= l, (struct coeff_ram_ctl *)kcontrol->private_value; struct soc_bytes_ext *params =3D &ctl->bytes_ext; =20 - mutex_lock(&tscs42xx->coeff_ram_lock); + guard(mutex)(&tscs42xx->coeff_ram_lock); =20 memcpy(ucontrol->value.bytes.data, &tscs42xx->coeff_ram[ctl->addr * COEFF_SIZE], params->max); =20 - mutex_unlock(&tscs42xx->coeff_ram_lock); - return 0; } =20 @@ -290,14 +281,14 @@ static int coeff_ram_put(struct snd_kcontrol *kcontro= l, unsigned int coeff_cnt =3D params->max / COEFF_SIZE; int ret; =20 - mutex_lock(&tscs42xx->coeff_ram_lock); + guard(mutex)(&tscs42xx->coeff_ram_lock); =20 tscs42xx->coeff_ram_synced =3D false; =20 memcpy(&tscs42xx->coeff_ram[ctl->addr * COEFF_SIZE], ucontrol->value.bytes.data, params->max); =20 - mutex_lock(&tscs42xx->pll_lock); + guard(mutex)(&tscs42xx->pll_lock); =20 if (plls_locked(component)) { ret =3D write_coeff_ram(component, tscs42xx->coeff_ram, @@ -305,18 +296,12 @@ static int coeff_ram_put(struct snd_kcontrol *kcontro= l, if (ret < 0) { dev_err(component->dev, "Failed to flush coeff ram cache (%d)\n", ret); - goto exit; + return ret; } tscs42xx->coeff_ram_synced =3D true; } =20 - ret =3D 0; -exit: - mutex_unlock(&tscs42xx->pll_lock); - - mutex_unlock(&tscs42xx->coeff_ram_lock); - - return ret; + return 0; } =20 /* Input L Capture Route */ @@ -385,21 +370,17 @@ static int dac_event(struct snd_soc_dapm_widget *w, struct tscs42xx *tscs42xx =3D snd_soc_component_get_drvdata(component); int ret; =20 - mutex_lock(&tscs42xx->coeff_ram_lock); + guard(mutex)(&tscs42xx->coeff_ram_lock); =20 if (!tscs42xx->coeff_ram_synced) { ret =3D write_coeff_ram(component, tscs42xx->coeff_ram, 0x00, COEFF_RAM_COEFF_COUNT); if (ret < 0) - goto exit; + return ret; tscs42xx->coeff_ram_synced =3D true; } =20 - ret =3D 0; -exit: - mutex_unlock(&tscs42xx->coeff_ram_lock); - - return ret; + return 0; } =20 static const struct snd_soc_dapm_widget tscs42xx_dapm_widgets[] =3D { @@ -926,12 +907,10 @@ static int setup_sample_rate(struct snd_soc_component= *component, return ret; } =20 - mutex_lock(&tscs42xx->audio_params_lock); + guard(mutex)(&tscs42xx->audio_params_lock); =20 tscs42xx->samplerate =3D rate; =20 - mutex_unlock(&tscs42xx->audio_params_lock); - return 0; } =20 @@ -1253,12 +1232,10 @@ static int tscs42xx_set_dai_bclk_ratio(struct snd_s= oc_dai *codec_dai, return ret; } =20 - mutex_lock(&tscs42xx->audio_params_lock); + guard(mutex)(&tscs42xx->audio_params_lock); =20 tscs42xx->bclk_ratio =3D ratio; =20 - mutex_unlock(&tscs42xx->audio_params_lock); - return 0; } =20 --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 770EF3749F4 for ; Thu, 23 Jul 2026 04:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782503; cv=none; b=jF+f4c8DuB6C8f7uBwhmd5c9Yw7N1oX3MEIstbTYIDHiApc76ITGSuCX00KHLedseT7mK0POuySshHg/DWTo6x7xl0yaz0PVxb53Uj4TRM4soQnp1X/7ZglLlhgGVyDjuIpfDd+BP581CSeqAw4OmE1v4gYdb4wCQKZG4wL/+OI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782503; c=relaxed/simple; bh=tQignsy0Uqf27H/ST9+cDOhKM7ywT6SKO99/+Fa+egA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=StBBBxLV0UodWM0mP0/Rnxey3eTClSogrUkLVwmoza0sGDMSIS55WLOC5Ue7fk56yiwTuisTnkPkGxcTfBRz/EM40xXswFB8BpVVmddsmc1DHHWqM57xlH1pVSYrXQdf0lsaOSJWaSBNyAxVhs7RUUEFycOza0cR4EkZLLAd95k= 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=TMUp2D63; arc=none smtp.client-ip=209.85.214.177 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="TMUp2D63" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2caced6038eso579285ad.0 for ; Wed, 22 Jul 2026 21:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782490; x=1785387290; 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=ipgET18nqnZuvZuo94ljzJ78lvwUk1zejtWxurs02pM=; b=TMUp2D63hyb0VInIniiTEy/5UJYZEfUaYgKZ5d0UCh+qYrL12YCaecyl43iqKheWaI aEA6fL+SB5yHxoWXqK40/lH4ojOm3dEc2Rk1n1i/ai0vS8wxjeWCZ0bGNAlYSLC636eF oJYEGusXXOQdpg238ILb4CouB+/bah+Cc4shEv8UpEnCWiRnO2sY9EdilqPD4OcCngoP NsjEG8/h3uo+kVdFh9vSnXSFou3yG32dhDLjgEMoLT3K/odwo7zpxgvQFnHXEy0j1XON D0RhK5P91Pxh/TigXaj619NJcN1r33c5qBtEpmFbTFgDwSd92GZP2jnSfNWmkExke2Ag pEQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782490; x=1785387290; 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=ipgET18nqnZuvZuo94ljzJ78lvwUk1zejtWxurs02pM=; b=H4XCwhMEuR9SXBIqQR5dt2NEZn/1xh83Mnin4pCyIWB4ELrfVsvIeQTpmAW7Y9jip9 AYt6sWY5xPurCncmm6MTwO9okuqXahSakQAVTx/3KuYJ9Z4OI+ByoJe6OCDJ7+GcxSG2 4iiNfrbON8cicbkDcNdGFyJrDtxdrQwEHI2Qlaj/zl1eopXsJXMzOBSSpR5lFZvAMmls +qBmCimcjC2Gh1mJRl0J/3tfR7i7Qob5ZWW424HjLGyxGhdeS0QMfSe0vKKCTR1DP+kK Qp5Vk7dNopBEv8RnFDBR6UzW9P7SCnYK5I57t3lN7k0Ev0N/MKbrUXGn34bCaYVBfXsO W9Jw== X-Forwarded-Encrypted: i=1; AHgh+RrlJLo6hqGsxfxV0QK5uJWXR0FkDZonmoJK5b5o+XVux7upTIpBwylR/a3OkQ9fwqT599z/8PUnnVO9Bzo=@vger.kernel.org X-Gm-Message-State: AOJu0YzoIub28jXc3GIxOq/HcBFKlIz0SJLwb04yry/qGM/ZY15fK1KD FREj3Q7oYq6R/Mzkvdog6UkK7weW+GQW/iPdcASrM1Vllr1bJZ2f2ca2 X-Gm-Gg: AR+sD10JOBPAVxRSDbGAWW5rsFkbYJ5PKKhrDsInL0BoOkVs8xV6ol8+FwiCkhwGHqR SxcK3iD3vfURg1vZd9SevE/jkF+0eShvb3CFAiPoZ3NwH5M7Pg3rOTfL/MX8zQItsnSU5QRBWsL 83nXkCXZJoCegvJ6b8oVqUwi+Ghj0yrwdPpTnbF0WXKt2vVvB5sSqM1qk4K2G8L+qbhmR6UwKxT SAItdB6H3H9wT2S2KzX0vbunyqmlNM7PlM9rU2XovEv6/58Pnc1XV56BulCShaLB065Mc0+ffR+ NlnsFizWv5+Jgpr9HK641qDl4ZP+ATeJGJbpsgQ4Ww9H3UtcoKMrJnyC282+t2H6Rkcd2du0Qn0 gx9cK4zMwNJs5M36ZEN2/6PWFfcPeDMJiQDzILdME6JuvLcxM/MVMVHxinVm8tB8CmfSXhzS7vZ v19qM4K7tbRRfiQDEFi+L+6H0W9yqXbTbxpSYE X-Received: by 2002:a17:902:c409:b0:2c9:97a7:3283 with SMTP id d9443c01a7336-2cfa954df7amr13349015ad.23.1784782490606; Wed, 22 Jul 2026 21:54:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:50 -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 09/26] ASoC: codecs: tscs454: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:10 +0700 Message-ID: <20260723045327.28260-10-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/tscs454.c | 107 +++++++++++++++---------------------- 1 file changed, 42 insertions(+), 65 deletions(-) diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c index aad394937ce6..b70c9d931e1e 100644 --- a/sound/soc/codecs/tscs454.c +++ b/sound/soc/codecs/tscs454.c @@ -4,6 +4,7 @@ // Author: Steven Eckhoff =20 #include +#include #include #include #include @@ -329,12 +330,10 @@ static int coeff_ram_get(struct snd_kcontrol *kcontro= l, return -EINVAL; } =20 - mutex_lock(coeff_ram_lock); - - memcpy(ucontrol->value.bytes.data, - &coeff_ram[ctl->addr * COEFF_SIZE], params->max); - - mutex_unlock(coeff_ram_lock); + scoped_guard(mutex, coeff_ram_lock) { + memcpy(ucontrol->value.bytes.data, + &coeff_ram[ctl->addr * COEFF_SIZE], params->max); + } =20 return 0; } @@ -428,15 +427,15 @@ static int coeff_ram_put(struct snd_kcontrol *kcontro= l, return -EINVAL; } =20 - mutex_lock(coeff_ram_lock); + guard(mutex)(coeff_ram_lock); =20 *coeff_ram_synced =3D false; =20 memcpy(&coeff_ram[ctl->addr * COEFF_SIZE], ucontrol->value.bytes.data, params->max); =20 - mutex_lock(&tscs454->pll1.lock); - mutex_lock(&tscs454->pll2.lock); + guard(mutex)(&tscs454->pll1.lock); + guard(mutex)(&tscs454->pll2.lock); =20 val =3D snd_soc_component_read(component, R_PLLSTAT); if (val) { /* PLLs locked */ @@ -446,18 +445,12 @@ static int coeff_ram_put(struct snd_kcontrol *kcontro= l, if (ret < 0) { dev_err(component->dev, "Failed to flush coeff ram cache (%d)\n", ret); - goto exit; + return ret; } *coeff_ram_synced =3D true; } =20 - ret =3D 0; -exit: - mutex_unlock(&tscs454->pll2.lock); - mutex_unlock(&tscs454->pll1.lock); - mutex_unlock(coeff_ram_lock); - - return ret; + return 0; } =20 static inline int coeff_ram_sync(struct snd_soc_component *component, @@ -465,41 +458,35 @@ static inline int coeff_ram_sync(struct snd_soc_compo= nent *component, { int ret; =20 - mutex_lock(&tscs454->dac_ram.lock); - if (!tscs454->dac_ram.synced) { - ret =3D write_coeff_ram(component, tscs454->dac_ram.cache, - R_DACCRS, R_DACCRADD, R_DACCRWDL, - 0x00, COEFF_RAM_COEFF_COUNT); - if (ret < 0) { - mutex_unlock(&tscs454->dac_ram.lock); - return ret; + scoped_guard(mutex, &tscs454->dac_ram.lock) { + if (!tscs454->dac_ram.synced) { + ret =3D write_coeff_ram(component, tscs454->dac_ram.cache, + R_DACCRS, R_DACCRADD, R_DACCRWDL, + 0x00, COEFF_RAM_COEFF_COUNT); + if (ret < 0) + return ret; } } - mutex_unlock(&tscs454->dac_ram.lock); =20 - mutex_lock(&tscs454->spk_ram.lock); - if (!tscs454->spk_ram.synced) { - ret =3D write_coeff_ram(component, tscs454->spk_ram.cache, - R_SPKCRS, R_SPKCRADD, R_SPKCRWDL, - 0x00, COEFF_RAM_COEFF_COUNT); - if (ret < 0) { - mutex_unlock(&tscs454->spk_ram.lock); - return ret; + scoped_guard(mutex, &tscs454->spk_ram.lock) { + if (!tscs454->spk_ram.synced) { + ret =3D write_coeff_ram(component, tscs454->spk_ram.cache, + R_SPKCRS, R_SPKCRADD, R_SPKCRWDL, + 0x00, COEFF_RAM_COEFF_COUNT); + if (ret < 0) + return ret; } } - mutex_unlock(&tscs454->spk_ram.lock); =20 - mutex_lock(&tscs454->sub_ram.lock); - if (!tscs454->sub_ram.synced) { - ret =3D write_coeff_ram(component, tscs454->sub_ram.cache, - R_SUBCRS, R_SUBCRADD, R_SUBCRWDL, - 0x00, COEFF_RAM_COEFF_COUNT); - if (ret < 0) { - mutex_unlock(&tscs454->sub_ram.lock); - return ret; + scoped_guard(mutex, &tscs454->sub_ram.lock) { + if (!tscs454->sub_ram.synced) { + ret =3D write_coeff_ram(component, tscs454->sub_ram.cache, + R_SUBCRS, R_SUBCRADD, R_SUBCRWDL, + 0x00, COEFF_RAM_COEFF_COUNT); + if (ret < 0) + return ret; } } - mutex_unlock(&tscs454->sub_ram.lock); =20 return 0; } @@ -658,16 +645,14 @@ static int set_sysclk(struct snd_soc_component *compo= nent) =20 static inline void reserve_pll(struct pll *pll) { - mutex_lock(&pll->lock); + guard(mutex)(&pll->lock); pll->users++; - mutex_unlock(&pll->lock); } =20 static inline void free_pll(struct pll *pll) { - mutex_lock(&pll->lock); + guard(mutex)(&pll->lock); pll->users--; - mutex_unlock(&pll->lock); } =20 static int pll_connected(struct snd_soc_dapm_widget *source, @@ -679,15 +664,13 @@ static int pll_connected(struct snd_soc_dapm_widget *= source, int users; =20 if (strstr(source->name, "PLL 1")) { - mutex_lock(&tscs454->pll1.lock); - users =3D tscs454->pll1.users; - mutex_unlock(&tscs454->pll1.lock); + scoped_guard(mutex, &tscs454->pll1.lock) + users =3D tscs454->pll1.users; dev_dbg(component->dev, "%s(): PLL 1 users =3D %d\n", __func__, users); } else { - mutex_lock(&tscs454->pll2.lock); - users =3D tscs454->pll2.users; - mutex_unlock(&tscs454->pll2.lock); + scoped_guard(mutex, &tscs454->pll2.lock) + users =3D tscs454->pll2.users; dev_dbg(component->dev, "%s(): PLL 2 users =3D %d\n", __func__, users); } @@ -806,7 +789,7 @@ static inline int aif_free(struct snd_soc_component *co= mponent, { struct tscs454 *tscs454 =3D snd_soc_component_get_drvdata(component); =20 - mutex_lock(&tscs454->aifs_status_lock); + guard(mutex)(&tscs454->aifs_status_lock); =20 dev_dbg(component->dev, "%s(): aif %d\n", __func__, aif->id); =20 @@ -829,8 +812,6 @@ static inline int aif_free(struct snd_soc_component *co= mponent, free_pll(tscs454->internal_rate.pll); } =20 - mutex_unlock(&tscs454->aifs_status_lock); - return 0; } =20 @@ -3174,7 +3155,7 @@ static int tscs454_hw_params(struct snd_pcm_substream= *substream, unsigned int val; int ret; =20 - mutex_lock(&tscs454->aifs_status_lock); + guard(mutex)(&tscs454->aifs_status_lock); =20 dev_dbg(component->dev, "%s(): aif %d fs =3D %u\n", __func__, aif->id, fs); @@ -3207,14 +3188,14 @@ static int tscs454_hw_params(struct snd_pcm_substre= am *substream, ret =3D set_aif_fs(component, aif->id, fs); if (ret < 0) { dev_err(component->dev, "Failed to set aif fs (%d)\n", ret); - goto exit; + return ret; } =20 ret =3D set_aif_sample_format(component, params_format(params), aif->id); if (ret < 0) { dev_err(component->dev, "Failed to set aif sample format (%d)\n", ret); - goto exit; + return ret; } =20 set_aif_status_active(&tscs454->aifs_status, aif->id, @@ -3223,11 +3204,7 @@ static int tscs454_hw_params(struct snd_pcm_substrea= m *substream, dev_dbg(component->dev, "Set aif %d active. Streams status is 0x%x\n", aif->id, tscs454->aifs_status.streams); =20 - ret =3D 0; -exit: - mutex_unlock(&tscs454->aifs_status_lock); - - return ret; + return 0; } =20 static int tscs454_hw_free(struct snd_pcm_substream *substream, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 5144236EABE for ; Thu, 23 Jul 2026 04:54:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782508; cv=none; b=hGqjByr9hSVvVu56KczQt6/QCvJhtYyYvPZ7mLASDHJ96yn7WhzJOoR7Xl84VyednWR1RM5pH7QTFOIHlYQIBdOMrOQUOHugUUmpPE0ev8S+LgYXqzzbXQ5dCzICBKyBdNAV0YLnqrHsevZ8Bxur5HYVpywkEtJaIveMoj6VmVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782508; c=relaxed/simple; bh=NTv0dA4h7p0NtOycmpwSiKJMd8uSAN1UAwPHu17+jvE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mXlgPynsQWOVT0Hpl90mgsVsfVv039nkWqgYeenHJEx1kRghmtojUpoCKVPEJXVUGaQbSWkgewlW9odX2J7VOYuCwLqk5t6qNJinmt/tVQxVUNKZB9BqFPMLVjQnyfkTK2n8Gt6hWHjCIwBjPItLjTLyq2Ry74ytly12lD8ziws= 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=kFcLHaZd; arc=none smtp.client-ip=209.85.214.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="kFcLHaZd" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cf52d15d88so2495165ad.2 for ; Wed, 22 Jul 2026 21:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782497; x=1785387297; 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=K9raJfp3OtJus9yMmtP+CvXPkqSwzVFDSD0PnOwRCW0=; b=kFcLHaZdR0ne2qKvy+TrDj0vmXVLoGXnP3l8oQIKcUGqpbF0RN1S4GnA9ktfrWPUER P47Qc14VuN/oKey306LnkMMcJko3uJEi4WPnNhb2D52B7Dd3NaGReduWSVcttSD+jE9G /oE2L2k3yJO1vtgWZfLMHaJP59N2+Fp3vQ7MFaEr55ARDEo8zDBh/pQIw5hfAEm04jqw Nn9Nb9qGFZU5eOv//Vek46aSVRmiN9e/i6M2XTlp8RdHCcFCAN0s345PhZvEVJwt1ere AT3/4KQvkE9RRdGd91Z4N4wmN3h3YOF928tpZcuq8fD/oYfOyL2iR1TZsrM0l6QY+iNb Z+Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782497; x=1785387297; 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=K9raJfp3OtJus9yMmtP+CvXPkqSwzVFDSD0PnOwRCW0=; b=nyq1qlNmn/MfZXIvKY/t5squ9hC1oqwXOBsHwjotp5Dc12azRNJdbrXHb+ifHlu1dJ ZXehmLfAHwuF1niSHG4EYKlALGMN+2pJ3GwLkm8end+lf+kKB269qI2MzQuikRxcgzo4 a+RdPDB6hPBkNxd7aLQAdTk6Qo9MWMsaZoXXKe3y6FJiQfmyoNXjegWAOpvFm+MfxHIo oEg0prY3Tq05WyDvfO0CXKml01J+296YJtjPIuCeT2oy0p9/wQofGyw2f6s1oUTgjZXy PoXXRE2uo2b+8du20rYOm1zdRh2sbHkRX4iVmj+M2qzmHtcyKN6R7au3CdFT2HZXFzNE GISg== X-Forwarded-Encrypted: i=1; AHgh+Ro9XCrUmw2xyYM9IZOo6P+0UKC4LJfTuOMU/JM43AouF5bvz1MtGVz5iClue6jsm+jRvyPVHvu3HpxEM/4=@vger.kernel.org X-Gm-Message-State: AOJu0YzhAggd+x/L/Lo/2Xhhk0zGubkorcigZpEl2USKY2SWNyZ7AXp4 m986gAEBwu0W42NI57yRhpVaetNh53PVM5m+UnRaVYNPCOa1dBHh54x3 X-Gm-Gg: AR+sD10ZCT67WFg6SyOVe1BBP11ALQ8waUcvoImQv80LqgPbBdu7pXPcoTQ57mFl6xk HKCpWVcxvfLby2dFzncQascGaQh7O5Z1A2K5y5broGMA5zSZfC0kze2RTpbvuAu6NEm949ne/yw KQ/tuTKbumyTV05gvAlD9Qqw6Mfwo5PdwDJ1ZgEa44FDSVBz/wsweNioUDXbQrRuPYn4/Aodh1b gfIuxXZKrPexE9DpKopO2iJsPSYPVA+kfXz3xdLAU+wdLdFETTx8GwarcidBZuk589qFtqJBLcz d9xfCtv4JbUUFOQtYbcbNKkq/zQN67StD/DksLfpwIByjhRmUsxOeOZokbeLyC9VtJZORn3QKas gMiKXPgxTL5w9Mrh8lmgnHbmUDjg/5S6/e3pK82hHM3lN0PIKC90KfuzN7hwwZVXQJq8iYY6AZS YIN9c1w5kvc8i1/fqElttRan4eJAAC4PLnbLf4 X-Received: by 2002:a17:902:fda4:b0:2c9:aae1:a61c with SMTP id d9443c01a7336-2cfa6b999e6mr19255985ad.20.1784782496893; Wed, 22 Jul 2026 21:54:56 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:54:56 -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 10/26] ASoC: codecs: twl6040: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:11 +0700 Message-ID: <20260723045327.28260-11-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/twl6040.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index e10c51092a35..650836f9615f 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -273,7 +274,7 @@ static void twl6040_hs_jack_report(struct snd_soc_compo= nent *component, struct twl6040_data *priv =3D snd_soc_component_get_drvdata(component); int status; =20 - mutex_lock(&priv->mutex); + guard(mutex)(&priv->mutex); =20 /* Sync status */ status =3D twl6040_read(component, TWL6040_REG_STATUS); @@ -281,8 +282,6 @@ static void twl6040_hs_jack_report(struct snd_soc_compo= nent *component, snd_soc_jack_report(jack, report, report); else snd_soc_jack_report(jack, 0, report); - - mutex_unlock(&priv->mutex); } =20 void twl6040_hs_jack_detect(struct snd_soc_component *component, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 7203139BFF2 for ; Thu, 23 Jul 2026 04:55:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782521; cv=none; b=akMXldJIQFY7w1mPmaa/m2H151jZOe/9fdEMetEofcoxhCALB982opTplS6Qd7KZnx1Z6Dfnq+eB5oErHR/Qjkil3VNCr4yWVc+qZbXwUE6JBwRnTnK3aPc+sKapd7+7TvzT5Yvx4WuN3VRZxiblNJvD/E8bYQC3vibVi388Wos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782521; c=relaxed/simple; bh=hc/OudOAJizkuq/tPHPl3KLl2IsjBuawl6/ZkFlthW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jGm7OkfkJYzDIIZdgDqTPlwhl2l6d1zBAq7mYG4WyoUw/FnzZn2ka8b0AT+bhGzENUxDqKNfSaDAINCQ8liFV6fYnFtEVHGm7cgUsgKEe6u6Naxh/rEl8n3hXseqKfMClPYV2bWHZUh+f2QuQgI+4tfvKPpEBT7NyRdXXJIyKo4= 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=D8sYc1Qc; arc=none smtp.client-ip=209.85.214.177 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="D8sYc1Qc" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2caced6038eso580775ad.0 for ; Wed, 22 Jul 2026 21:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782504; x=1785387304; 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=yDs90EL5tDIcZCjfhXzWzxz6QJUAxk7BYmfEQH08RuU=; b=D8sYc1QcmcZd+BXBYE2foridd4Q1zuTboKfDiu3v6gJRy7RmcINPTrb0VIEqoWzZxR 4GC18mtmf7Znil760E+mNeHWNpi9p0RwC6/oPgglzWyQYqvcQ2z+ZU4Lqyh8Enycfmnb yKppcxl55kMK7wl92ma14s459KVqJSe240grdlxO1M/h82N7pK8HffifUvBzuW0zjMlB dxNnKf8v261/Sfhwe5XReozLNceptO7v4iceWdQgYam4BwYbDKj1pN8kI/7COD+egZnm PAAkqd9pODr3RrsiIONPyMjGUegQcD/ESDhcBG08xI9xY2X8mEapDM78v5wRayUOkBmr u7jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782504; x=1785387304; 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=yDs90EL5tDIcZCjfhXzWzxz6QJUAxk7BYmfEQH08RuU=; b=dEn3mXOIPWj2UrbDyDDjtiBSn9uop6w1Nrxz0IYxBmdeFO2v189rBoWo1xscMPksNi J5ru7IkPGImU4XCpj0o8F0yEkGzVPAsi07malt5xmmjR3t47uTCk28sqFQlWOLNQn3Rz OZeY0o2NTlb20Pkufs8eES87Jxuwc7vkCz3kXyE4TEMsG1UHWOrfbo527hJPaosghNp7 weTNxEsiBzkzf9LwD7VE11et6WW4+cpNxyNzny2bsNXmmnh179fDi4VQfipc/W8yTOAw fXOBZLqpNfTKgDWEBYjj0rtOKqE3zHrbKQ/qfJPEx4zaVS+joNvad0sW7X5KDgGfRuik YlyA== X-Forwarded-Encrypted: i=1; AHgh+RqV6prDtitCjH/WFx6tF1yApNepKRPgvo/tHp2mZZpNAHvqS/uCDVSrPZjihjgUc6yrb3BGJlOF0X/UVEs=@vger.kernel.org X-Gm-Message-State: AOJu0YyaRWGE57CrEddtl9KQL9+EQW/gxS9O43lgEtq4Tfhr4Os5AWO7 F3FIIlkJpoC9Br41CYMwJx9Wv/RSSIJeo5F1tB2TL25649dW2mOfhoRP X-Gm-Gg: AR+sD13IW2d3KgUD0JIj68qZVW/zH1apUFfGsUWiQ3eCWVqbH4shlCAl+D4iyTEGgn2 mhlYO0uYUH0W6N8sjML8JrPR+s9oQpKCKUcSa0PWQM1E4rnuZFt6NNDOiBLKvVxZhpNOrdhr9op L+2fg4ovv0WTmb/NOv++0PUd2CIAfmB9Gxfy8HHQmSXtTdmkpYI2uvbtLYI3ZdUBpW33fY0hHhY Oe1Gb5MMZhwQL8eQER79hKNzuUr1Lr3ZTQ1DWy3tF+aHiVG8hMsu1tTqI2pAfVHZSQ20SrUtxcV Zh6imjHoRL6xhb5UCdr7FDQZp5xtoGZmT93q+AOFhyN6tZOUxZIq+uSl9nlycTKR8oIG8qomac/ plLYUMI8+KMj9iJ/zEx/ZsgeJxam41VGsSSYpE8ZDpTnZajaZYzaqDyT4zZ4KxLLyQ7O1UX6wtH 0WjJrOD96RVmKRwgDc708S0qXNsqQbE4oF+jED X-Received: by 2002:a17:903:1aa6:b0:2ce:b3cd:7539 with SMTP id d9443c01a7336-2cfa9476c25mr12872455ad.6.1784782503648; Wed, 22 Jul 2026 21:55:03 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:03 -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 11/26] ASoC: codecs: wcd-mbhc: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:12 +0700 Message-ID: <20260723045327.28260-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wcd-mbhc-v2.c | 140 ++++++++++++++++----------------- 1 file changed, 66 insertions(+), 74 deletions(-) diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index bb0c8478a8eb..1b7d481e5132 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. =20 +#include #include #include #include @@ -419,9 +420,8 @@ static void wcd_cancel_hs_detect_plug(struct wcd_mbhc *= mbhc, struct work_struct *work) { mbhc->hs_detect_work_stop =3D true; - mutex_unlock(&mbhc->lock); + guard(mutex)(&mbhc->lock); cancel_work_sync(work); - mutex_lock(&mbhc->lock); } =20 static void wcd_mbhc_cancel_pending_work(struct wcd_mbhc *mbhc) @@ -458,7 +458,7 @@ static void wcd_mbhc_find_plug_and_report(struct wcd_mb= hc *mbhc, if (mbhc->current_plug =3D=3D plug_type) return; =20 - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); =20 switch (plug_type) { case MBHC_PLUG_TYPE_HEADPHONE: @@ -481,7 +481,6 @@ static void wcd_mbhc_find_plug_and_report(struct wcd_mb= hc *mbhc, mbhc->current_plug, plug_type); break; } - mutex_unlock(&mbhc->lock); } =20 static void wcd_schedule_hs_detect_plug(struct wcd_mbhc *mbhc, @@ -673,29 +672,28 @@ static irqreturn_t wcd_mbhc_btn_press_handler(int irq= , void *data) int mask; unsigned long msec_val; =20 - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); wcd_cancel_btn_work(mbhc); mbhc->is_btn_press =3D true; msec_val =3D jiffies_to_msecs(jiffies - mbhc->jiffies_atreport); =20 /* Too short, ignore button press */ if (msec_val < MBHC_BUTTON_PRESS_THRESHOLD_MIN) - goto done; + return IRQ_HANDLED; =20 /* If switch interrupt already kicked in, ignore button press */ if (mbhc->in_swch_irq_handler) - goto done; + return IRQ_HANDLED; =20 /* Plug isn't headset, ignore button press */ if (mbhc->current_plug !=3D MBHC_PLUG_TYPE_HEADSET) - goto done; + return IRQ_HANDLED; =20 mask =3D wcd_mbhc_get_button_mask(mbhc); mbhc->buttons_pressed |=3D mask; if (schedule_delayed_work(&mbhc->mbhc_btn_dwork, msecs_to_jiffies(400)) = =3D=3D 0) WARN(1, "Button pressed twice without release event\n"); -done: - mutex_unlock(&mbhc->lock); + return IRQ_HANDLED; } =20 @@ -704,14 +702,14 @@ static irqreturn_t wcd_mbhc_btn_release_handler(int i= rq, void *data) struct wcd_mbhc *mbhc =3D data; int ret; =20 - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); if (mbhc->is_btn_press) mbhc->is_btn_press =3D false; else /* fake btn press */ - goto exit; + return IRQ_HANDLED; =20 if (!(mbhc->buttons_pressed & WCD_MBHC_JACK_BUTTON_MASK)) - goto exit; + return IRQ_HANDLED; =20 ret =3D wcd_cancel_btn_work(mbhc); if (ret =3D=3D 0) { /* Reporting long button release event */ @@ -725,8 +723,6 @@ static irqreturn_t wcd_mbhc_btn_release_handler(int irq= , void *data) } } mbhc->buttons_pressed &=3D ~WCD_MBHC_JACK_BUTTON_MASK; -exit: - mutex_unlock(&mbhc->lock); =20 return IRQ_HANDLED; } @@ -768,62 +764,60 @@ static int wcd_mbhc_initialise(struct wcd_mbhc *mbhc) return ret; } =20 - mutex_lock(&mbhc->lock); - - if (mbhc->cfg->typec_analog_mux) - mbhc->swap_thr =3D GND_MIC_USBC_SWAP_THRESHOLD; - else - mbhc->swap_thr =3D GND_MIC_SWAP_THRESHOLD; - - /* setup HS detection */ - if (mbhc->mbhc_cb->hph_pull_up_control_v2) - mbhc->mbhc_cb->hph_pull_up_control_v2(component, - mbhc->cfg->typec_analog_mux ? - HS_PULLUP_I_OFF : HS_PULLUP_I_DEFAULT); - else if (mbhc->mbhc_cb->hph_pull_up_control) - mbhc->mbhc_cb->hph_pull_up_control(component, - mbhc->cfg->typec_analog_mux ? - I_OFF : I_DEFAULT); - else - wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_CTRL, - mbhc->cfg->typec_analog_mux ? 0 : 3); - - wcd_mbhc_write_field(mbhc, WCD_MBHC_HPHL_PLUG_TYPE, mbhc->cfg->hphl_swh); - wcd_mbhc_write_field(mbhc, WCD_MBHC_GND_PLUG_TYPE, mbhc->cfg->gnd_swh); - wcd_mbhc_write_field(mbhc, WCD_MBHC_SW_HPH_LP_100K_TO_GND, 1); - if (mbhc->cfg->gnd_det_en && mbhc->mbhc_cb->mbhc_gnd_det_ctrl) - mbhc->mbhc_cb->mbhc_gnd_det_ctrl(component, true); - wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_COMP_CTRL, 1); - - /* Plug detect is triggered manually if analog goes through USBCC */ - if (mbhc->cfg->typec_analog_mux) - wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 0); - else - wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 1); - - if (mbhc->cfg->typec_analog_mux) - /* Insertion debounce set to 48ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 4); - else - /* Insertion debounce set to 96ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 6); + scoped_guard(mutex, &mbhc->lock) { + if (mbhc->cfg->typec_analog_mux) + mbhc->swap_thr =3D GND_MIC_USBC_SWAP_THRESHOLD; + else + mbhc->swap_thr =3D GND_MIC_SWAP_THRESHOLD; + + /* setup HS detection */ + if (mbhc->mbhc_cb->hph_pull_up_control_v2) + mbhc->mbhc_cb->hph_pull_up_control_v2(component, + mbhc->cfg->typec_analog_mux ? + HS_PULLUP_I_OFF : HS_PULLUP_I_DEFAULT); + else if (mbhc->mbhc_cb->hph_pull_up_control) + mbhc->mbhc_cb->hph_pull_up_control(component, + mbhc->cfg->typec_analog_mux ? + I_OFF : I_DEFAULT); + else + wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_CTRL, + mbhc->cfg->typec_analog_mux ? 0 : 3); + + wcd_mbhc_write_field(mbhc, WCD_MBHC_HPHL_PLUG_TYPE, mbhc->cfg->hphl_swh); + wcd_mbhc_write_field(mbhc, WCD_MBHC_GND_PLUG_TYPE, mbhc->cfg->gnd_swh); + wcd_mbhc_write_field(mbhc, WCD_MBHC_SW_HPH_LP_100K_TO_GND, 1); + if (mbhc->cfg->gnd_det_en && mbhc->mbhc_cb->mbhc_gnd_det_ctrl) + mbhc->mbhc_cb->mbhc_gnd_det_ctrl(component, true); + wcd_mbhc_write_field(mbhc, WCD_MBHC_HS_L_DET_PULL_UP_COMP_CTRL, 1); + + /* Plug detect is triggered manually if analog goes through USBCC */ + if (mbhc->cfg->typec_analog_mux) + wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 0); + else + wcd_mbhc_write_field(mbhc, WCD_MBHC_L_DET_EN, 1); =20 - /* Button Debounce set to 16ms */ - wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_DBNC, 2); + if (mbhc->cfg->typec_analog_mux) + /* Insertion debounce set to 48ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 4); + else + /* Insertion debounce set to 96ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_INSREM_DBNC, 6); =20 - /* enable bias */ - mbhc->mbhc_cb->mbhc_bias(component, true); - /* enable MBHC clock */ - if (mbhc->mbhc_cb->clk_setup) - mbhc->mbhc_cb->clk_setup(component, - mbhc->cfg->typec_analog_mux ? false : true); + /* Button Debounce set to 16ms */ + wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_DBNC, 2); =20 - /* program HS_VREF value */ - wcd_program_hs_vref(mbhc); + /* enable bias */ + mbhc->mbhc_cb->mbhc_bias(component, true); + /* enable MBHC clock */ + if (mbhc->mbhc_cb->clk_setup) + mbhc->mbhc_cb->clk_setup(component, + mbhc->cfg->typec_analog_mux ? false : true); =20 - wcd_program_btn_threshold(mbhc, false); + /* program HS_VREF value */ + wcd_program_hs_vref(mbhc); =20 - mutex_unlock(&mbhc->lock); + wcd_program_btn_threshold(mbhc, false); + } =20 pm_runtime_put_autosuspend(component->dev); =20 @@ -1327,7 +1321,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, v= oid *data) unsigned long timeout; int adc_threshold, output_mv, retry =3D 0; =20 - mutex_lock(&mbhc->lock); + guard(mutex)(&mbhc->lock); timeout =3D jiffies + msecs_to_jiffies(WCD_FAKE_REMOVAL_MIN_PERIOD_MS); adc_threshold =3D wcd_mbhc_adc_get_hs_thres(mbhc); =20 @@ -1342,7 +1336,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, v= oid *data) =20 /* Check for fake removal */ if ((output_mv <=3D adc_threshold) && retry > FAKE_REM_RETRY_ATTEMPTS) - goto exit; + return IRQ_HANDLED; } while (!time_after(jiffies, timeout)); =20 /* @@ -1359,8 +1353,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, v= oid *data) wcd_mbhc_elec_hs_report_unplug(mbhc); wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_ISRC_CTL, 0); =20 -exit: - mutex_unlock(&mbhc->lock); return IRQ_HANDLED; } =20 @@ -1622,10 +1614,10 @@ void wcd_mbhc_deinit(struct wcd_mbhc *mbhc) free_irq(mbhc->intr_ids->mbhc_btn_press_intr, mbhc); free_irq(mbhc->intr_ids->mbhc_sw_intr, mbhc); =20 - mutex_lock(&mbhc->lock); - wcd_cancel_hs_detect_plug(mbhc, &mbhc->correct_plug_swch); - cancel_work_sync(&mbhc->mbhc_plug_detect_work); - mutex_unlock(&mbhc->lock); + scoped_guard(mutex, &mbhc->lock) { + wcd_cancel_hs_detect_plug(mbhc, &mbhc->correct_plug_swch); + cancel_work_sync(&mbhc->mbhc_plug_detect_work); + } =20 kfree(mbhc); } --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.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 CAF753A4F3B for ; Thu, 23 Jul 2026 04:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782533; cv=none; b=cNg+6TOrQ1FBiwxO5jwdpUDkOR2YC7gsr73xHSi7jA9QTLvM8/RQ9DN9q1WK8QbLZ9U7yZJdOr8MtMBWs6gTDoaEmaLmGbctzsY+vM++60zxZPKgyL1y0iyLnw3JBbFRzWqFVGxotUrfsR08gKkf6dgo9So6oZADwTF4bZ9nDj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782533; c=relaxed/simple; bh=j5EzUp9GOmwEDgm+25/nvJ3ZrhLORshzsn3d8vYHp/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=slBzuoEnrMnJ9BWZk/QShU3upyHP8DqGJyvancpFgeJ2I7LcFyhR/bw/47TOVwtva/D8kYYISBLa5bTyi21CzxzF6JA9VRMOd3jH9zJooQ143du7Y66IMCqHO73n9ekkgcAtYvwc1YrU/mVGE3C/O8i+O7Qa2WMN27MU+uaqAPk= 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=NV2yn7rb; arc=none smtp.client-ip=209.85.214.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="NV2yn7rb" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cc73e322dbso2560345ad.1 for ; Wed, 22 Jul 2026 21:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782516; x=1785387316; 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=gdWonKZwUM9E97TXsH6QIsXcmSxW8h25KlrkA4nBf18=; b=NV2yn7rbiUIN0epKd6Lk9DuqQRi1oTAVqnk/+FWVOqvLqP9aXCiRR56E0eu5oPhOQs EKhu1NtP+Qtkmzl/xcZxjzxcjAdEFRE9WGtB6o4e5nvkCJyAx/Q+o0oZMKsZyDOsF6P2 h3DRtbFh3R+Z/1CHkTIJjoEk9IKRBzQ8BZuXGxSLpDke1ayj8pfXzlwa0s5GfG9XVFuB fRTWdAzCyQ2y0fQJaU+QK2ntLNcLSs1ARXzJtSfyWIAMOPqxBgKJR8DCRvyUxntf3PhR gtG1msqO0G6dQo4AL5JjV/YYhk1VUSa1uns7qnZP0dY+MDd5TOS8kIkfO7aUJo5u9G4W u7jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782516; x=1785387316; 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=gdWonKZwUM9E97TXsH6QIsXcmSxW8h25KlrkA4nBf18=; b=LXhMnUT6wJASF1kD1vmYO0Df6cWlBKEy7swi+nenEu32wMVxCORpTMS4qhBjafGgWJ w+Z0sD1owri20BvunvWWHwAHTb2coOGIvDTnOlMDhBR7ERTnUIDjw6zRdeNtuQl2hbEQ ukRKDJf3ZU4CIBIvkryZtDE8HURNrgKpjrjcZKLK+4xxGKLvYN9+IpoSIdIttTu/KYik fTRO9u5tYyc7KZ7nsiIYXJU0flPhMSDN7PGH5TkK+nZ0dcutOmh3JnvXKVLa2LhtQ49S jaDah+9k4E2kKB1E8/ppfrIGZPnKZG7aZ2w+IJ+Gfl8AaH81FQHzHQeKAPIbnyNbNL1t /g6g== X-Forwarded-Encrypted: i=1; AHgh+RpSM6EKaVqjGakV1R9BfIZIG6187R+/flNnz3uJckWBg9ccRcWEoImyJrnmuMnx+02E6wAZxk5DWpu55qs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+xaetLnZ8YhNrE2dScyPJ3ufKy7nkMEuX2WKlT8akRuZ2FdUX ILwqbik/a43DHXeoigV9muJ7+cV/Tuwxti+khUase2Dw5fZM0Q9h7jBG X-Gm-Gg: AR+sD133Y7dk1ir5nG3IPBIx3NcyRrkdia8v1em4Q6UH0jtqzzix19JWT5AI4ExCSPO ijxWGo5xKiFGaFs7T5J7oJza5ihJXtw5lAlabDKmnK/zmpd5sFrpG/ZU6rC2wtA7LknqaSrUSIo +1ooE59DSGMTgxjsy7B24dZ2nZN2mx47HGDbE5qL77Z2LWyR5HbY3IdRFf5j04JNHje9ZXDoDaj cU7R9q1VaGkSZdAoGEx62SI12rDS2ysYKWQXlp9RzNUbED0GmMhvRXwT6vv0t5ET8z1mmOqe2T8 UoafgX400+JQmxx0Vd3WgH/pjMQfwQzmk3ph8lkRJzvjViY0spflx2ckxeJAGZuIgG3XBW+q6vB /vsv362NDTzs/ehod26M1lQoLiOJmcGhLaNP7zp7tY3gMsdgb5V1I9aadLqL8En95SWpPXXrFtZ yf26lXiEk+242cOWXCrl4qLeLdapjhViA4Wz4C X-Received: by 2002:a17:903:ac6:b0:2cf:9f62:1dcd with SMTP id d9443c01a7336-2cfa6d83500mr22439685ad.32.1784782516322; Wed, 22 Jul 2026 21:55:16 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:16 -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 12/26] ASoC: codecs: wcd934x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:13 +0700 Message-ID: <20260723045327.28260-13-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wcd934x.c | 42 ++++++++++++++------------------------ 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index bc41a1466c70..11108c37648f 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -1265,13 +1265,10 @@ static int wcd934x_set_sido_input_src(struct wcd934= x_codec *wcd, int sido_src) =20 static int wcd934x_enable_ana_bias_and_sysclk(struct wcd934x_codec *wcd) { - mutex_lock(&wcd->sysclk_mutex); - - if (++wcd->sysclk_users !=3D 1) { - mutex_unlock(&wcd->sysclk_mutex); - return 0; + scoped_guard(mutex, &wcd->sysclk_mutex) { + if (++wcd->sysclk_users !=3D 1) + return 0; } - mutex_unlock(&wcd->sysclk_mutex); =20 regmap_update_bits(wcd->regmap, WCD934X_ANA_BIAS, WCD934X_ANA_BIAS_EN_MASK, @@ -1328,12 +1325,10 @@ static int wcd934x_enable_ana_bias_and_sysclk(struc= t wcd934x_codec *wcd) =20 static int wcd934x_disable_ana_bias_and_syclk(struct wcd934x_codec *wcd) { - mutex_lock(&wcd->sysclk_mutex); - if (--wcd->sysclk_users !=3D 0) { - mutex_unlock(&wcd->sysclk_mutex); - return 0; + scoped_guard(mutex, &wcd->sysclk_mutex) { + if (--wcd->sysclk_users !=3D 0) + return 0; } - mutex_unlock(&wcd->sysclk_mutex); =20 regmap_update_bits(wcd->regmap, WCD934X_CLK_SYS_MCLK_PRG, WCD934X_EXT_CLK_BUF_EN_MASK | @@ -2384,7 +2379,7 @@ static int wcd934x_micbias_control(struct snd_soc_com= ponent *component, __func__, micb_num); return -EINVAL; } - mutex_lock(&wcd934x->micb_lock); + guard(mutex)(&wcd934x->micb_lock); =20 switch (req) { case MICB_PULLUP_ENABLE: @@ -2446,8 +2441,6 @@ static int wcd934x_micbias_control(struct snd_soc_com= ponent *component, break; } =20 - mutex_unlock(&wcd934x->micb_lock); - return 0; } =20 @@ -2488,7 +2481,7 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, int req_volt, int micb_num) { struct wcd934x_codec *wcd934x =3D snd_soc_component_get_drvdata(component= ); - int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en, ret =3D 0; + int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en; =20 switch (micb_num) { case MIC_BIAS_1: @@ -2506,7 +2499,7 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd934x->micb_lock); + guard(mutex)(&wcd934x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -2521,15 +2514,11 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct = snd_soc_component *component, WCD934X_MICB_VAL_MASK); =20 req_vout_ctl =3D wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret =3D -EINVAL; - goto exit; - } + if (req_vout_ctl < 0) + return -EINVAL; =20 - if (cur_vout_ctl =3D=3D req_vout_ctl) { - ret =3D 0; - goto exit; - } + if (cur_vout_ctl =3D=3D req_vout_ctl) + return 0; =20 if (micb_en =3D=3D WCD934X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -2550,9 +2539,8 @@ static int wcd934x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd934x->micb_lock); - return ret; + + return 0; } =20 static int wcd934x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *= component, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 EA6B338F259 for ; Thu, 23 Jul 2026 04:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782541; cv=none; b=KGIVWbm8dHxo1rEul7VVzvyi2dmOfFkHbFeBQ/0EoJEfJawAEWrEilMdrGW+OI0dC6BFY4j7LvSohi3cdsZAIMY06/Z0Eq0/8RrjVUXRINAddtcbOp9W1KQNdJnDOlIda/bBW0X27l+AHKL8bPuj3srqo6+Q4f9OBHNKGeA3TP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782541; c=relaxed/simple; bh=ejYwKV1fvCU+OGYNk147FP+gAndpm1ujSerj4glbyk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sdm80Xdl93FsfTPgMOQ6sGN4gMHeiSODZUwss4c+C1sB8zNkC4ZzF+ohK1lq8d04kpb3NgwD8xgywwcSAxhkGPYlmwMsFAj3F/z6rx5atWb2lwwqnle6BJhPjIltSaZTWNb8556J53UzRC6KJKoAJta0tuXjyBGDDxQpfi9QSeQ= 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=U8uPSaVX; arc=none smtp.client-ip=209.85.214.173 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="U8uPSaVX" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2caced6038eso583635ad.0 for ; Wed, 22 Jul 2026 21:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782529; x=1785387329; 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=PMQIA5NlQdKTc/dqW/t5DllpXIgAMPtDSEZ406vK3Lc=; b=U8uPSaVXcpY+s075gkaVd/QBPfhTo9snXWIzVHSlcPaTDnK+LmLwKhBMtPujtWl4Ke rtGYkR8GHy1zt6TCsdy31+gZx2pRh3sp1hIuUQXu40NJ/nl71PTYGiZitJ0uIuxzkLTx gUtQMzAshFVVGfaf5r50zWio0yUk96CnKFIvcg12DaJJwgYkFPU/KUv3lnPaS4tA0z/3 QSES42D6dzW0GdQP2bKoEEkWyZ3u04IFrGCOEwBvZDFNredhl68hHhiPNaxkKC+TOMNZ 9lIKRTfYFUdRSpuYo/ezRVSCGK9zS3mCykIvCGd6YPqrYYqgH8RVOceiiYypDTaOXaQ8 jNlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782529; x=1785387329; 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=PMQIA5NlQdKTc/dqW/t5DllpXIgAMPtDSEZ406vK3Lc=; b=UpPh1AsJCU7/y8oHOomyUfxHqs1o7OzEmjrgmb/p9l0Tz0Uz9rLuvgJP6I0UZr+3Xh GL+yBQYWpWcrEsw1AZzZ8BvTcQk/Y7j5In/8hYnzmP9uq/kWPOIgpsybwuC1J9xuyWw4 oAoFQG2J1IoGUKqZnylnWBWf8QvkFkIzOhDJOahZKFewy3wENrsnkzXZ+4ZOnzVsq4qo rkstkdnotL3yan+9nnqDsgE102ujg/mTJlAY0/tDEzR9kKGhLQqNyM+qcp0l/SETe5bz jxdMJ5D+1Xt73UmeJW/QU5IP279YyUdB/tgZx8FvjQAqpeF/oSSpvcVN898bgK2tNg1w g6yw== X-Forwarded-Encrypted: i=1; AHgh+RpA8gQLuaDUYKBDil30pK4jA81toqJLFKIB4t/7zac7cpQfmhH+35pgFw318vwmshZa2t1FVlyEoeTUQhc=@vger.kernel.org X-Gm-Message-State: AOJu0YwTUva+n320KXNX4yyhoJpTwCNc79T+9gLzBTQqjB0LBwIvLtzy iE/9sCSy+iK107FIl5VUjR1bDlqsJaKCoOB0Xv/Ew+XEwFY8QSeG78wf X-Gm-Gg: AR+sD12HPAycxmC7P1SZ74OAhKp/b1n8QAjmr0fba5LP6SUsRwS07fKZEoUFziXcfz2 y44ceBtdI4/sQAFmoBlBNa+Gbc9Jora6bq3r9sS0knHmm7yoWQucUnada5uCKqPle8tXrJpJxFv 9yKwIp3ZrbgFbOh8mmREr7VcHBeE/aFjQR/88BnOOb2a0CBCyK9GJzF8IbfX7DbwJHVckyuhlD1 HPBjeWKdQr1s3g0BUaSDrGj7a5pugrIxCpKfw9/LjVGaRTjyQNftvXmySy3J7XbArJgQY083l2G C0Fgl2X0qNI3/vdzG4vQkbs8FtK3iO4LbDcxhCDBU01WinaI7/dRR0gnqwdaiB9Xd4jjqqlJMIA lSGCo8DHNRwMjB1N2nglLbyHtLgQGPMNHuB+TXYkWu2mTOYNr7MuRT+6xIMnQ8yIbHddNdsFyId uCATbtvbzMVD9/jYj1LRrWQ7cItkXyxlgQFqKqtD71czHkBkY= X-Received: by 2002:a17:902:dac6:b0:2ca:eff:ff58 with SMTP id d9443c01a7336-2cfa95025a6mr11869245ad.15.1784782529288; Wed, 22 Jul 2026 21:55:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:28 -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 13/26] ASoC: codecs: wcd937x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:14 +0700 Message-ID: <20260723045327.28260-14-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wcd937x.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c index e0169e783ee9..0dd05604f5b8 100644 --- a/sound/soc/codecs/wcd937x.c +++ b/sound/soc/codecs/wcd937x.c @@ -2,6 +2,7 @@ // Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights res= erved. =20 #include +#include #include #include #include @@ -1056,7 +1057,7 @@ static int wcd937x_micbias_control(struct snd_soc_com= ponent *component, return -EINVAL; } =20 - mutex_lock(&wcd937x->micb_lock); + guard(mutex)(&wcd937x->micb_lock); switch (req) { case MICB_PULLUP_ENABLE: wcd937x->pullup_ref[micb_index]++; @@ -1136,7 +1137,6 @@ static int wcd937x_micbias_control(struct snd_soc_com= ponent *component, } break; } - mutex_unlock(&wcd937x->micb_lock); =20 return 0; } @@ -1460,7 +1460,7 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, int req_volt, int micb_num) { struct wcd937x_priv *wcd937x =3D snd_soc_component_get_drvdata(component); - int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en, ret =3D 0; + int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en; =20 switch (micb_num) { case MIC_BIAS_1: @@ -1475,7 +1475,7 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd937x->micb_lock); + guard(mutex)(&wcd937x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -1490,15 +1490,11 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct = snd_soc_component *component, WCD937X_MICB_VOUT_MASK); =20 req_vout_ctl =3D wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret =3D -EINVAL; - goto exit; - } + if (req_vout_ctl < 0) + return -EINVAL; =20 - if (cur_vout_ctl =3D=3D req_vout_ctl) { - ret =3D 0; - goto exit; - } + if (cur_vout_ctl =3D=3D req_vout_ctl) + return 0; =20 if (micb_en =3D=3D WCD937X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -1519,9 +1515,8 @@ static int wcd937x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd937x->micb_lock); - return ret; + + return 0; } =20 static int wcd937x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *= component, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 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 AE19439CD0D for ; Thu, 23 Jul 2026 04:55:39 +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=1784782554; cv=none; b=sIXdOk3muciL4m4NB1MaxVg4v4GDsM2Qj/3Sh9SF8xAlGeoTnsP2iCg5+YJNniAHaVdQcaaQdva5b/ku+T++IrE+Arf9cS2toU+PKP9c9NmtcurNb6ZMZpi5zjgAsNbHtJCjLzk7hn2j1pH7daJCy6eOE8LHCaQQPVJ5ouGCc2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782554; c=relaxed/simple; bh=XnhnsPyA5QSjzg0tuQcdHLbqpbZbFqUdXNayJneipxM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VDdRQvDwtKAJDGud/5J7mgIU5DgBN8PXebt9aXihk9RBVOzOaumkGvG90VPkSNGVcsjcniR/paT4RaVqd4Qb2O9zOCZZuX7IHw18KBeBKxP1LhysUzH6wChDvO35QOAMs7RbxO8FnhH/glMQxLbj7kgcKLUvfgCENRl34rLJft0= 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=js8NIlJw; 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="js8NIlJw" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso2562125ad.2 for ; Wed, 22 Jul 2026 21:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782537; x=1785387337; 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=RK1Qg1zMLuqf3deYuh7H14WODBPPcltBb1uxyeY+ius=; b=js8NIlJwSHr23fZWHoS5PHqp3zqIq88ETdsKVjE7r3ecsCgmNkeExepHyKVvUZ++Bb +8o/Ho0CgOxQ2mm8slUY3zlaHKWOnMaZPosARZcX3uoEK6FfQWDT2YeeVEjzj/zSMNKV oIfRwJHNO7gZs/UCdxIKdVeU7L2rM4to+Z3VodyCSYhco3tz01M6CDEouxvjt90TC/yY gQMiBAMqbG5DxAb73j3pwPV3214hlw48GgNsgD0rDHNdPAeZi6FGDEDJl94+PkXMkhXT YE8WbHtsIVRYTrvV/bXUN92nBxQ1DqojWbKqKBXn+4Ml1np+i6Mj9tlFZMgaski5/zoX ZAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782537; x=1785387337; 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=RK1Qg1zMLuqf3deYuh7H14WODBPPcltBb1uxyeY+ius=; b=qdPR7LktVXJi53rjBHA61P7dNSjVCLFGKPrzGqZ9PZVJ6Tl0iOY4RZP7LgqVW9VtyY rUYjqmAOslgEiSp4GsCgzMaBbVtVDkgLUUVyHGMShaE5zGXVsLefvbtzXNUlhkvOjxCK LNmOpGsJGkRuOo/eySgpsdNC3VaDEDpp80GCLY1XIGq7Dd2UgW1l1uYLcHNxchvv82WV 69KAYH+Y4nk0mJTHxenonlTC0W1pNTfyRclPFpmd0ui+0UUjjfq85FVmkXoyv94BymCU lgfPad321/KN2Wuakcfo84GWx6MjPSUvEG2FxE2yOCCUFHO/60dreig0ixmS5RMYv8rk SVVA== X-Forwarded-Encrypted: i=1; AHgh+Ro+30OTy7moEAQTevLaHjlCJDz9L89pmpwDfGTR8nDkt3pSnLK2ETwnUmiNcPBzLHuho+sbCoxSc1VDw4c=@vger.kernel.org X-Gm-Message-State: AOJu0YxzccDw/D02BEREnw7UWskJP1+/f2YA4ByKUp5qtTd5Y9b5bP3V T4y1986o5VJ+flbdQUIE+WeVIA8SHiac6e1BTbCotL6JMjA/Ym9bx2Lz X-Gm-Gg: AR+sD10y/Q1vkCNoXl+4Ij2CQncHdHH3/QAMXlwAZAVq5HtC1yg4YOyqkVVv15xHpzM tIpCWNfutJMKQOkRhDD9X+aJJLtxEtwI7pdGfKQoLQr1YHdGaVw7PXHRqLIeYR37WASZzQQGOlE 4UFAJpVehYTofzq/xL7pdeNlVrtdgVqbuvJ7KYx5SjiauptLHrrhMqbr20ZMBLipvMT4QoMcSbN aBOjZ8aDo6KkCJp0Yt/5vtsEcFbxXUFgbTXsb0XbXs6lHCTxFRj6Gc+JLreLe7TznhJCSBbgWua GJMw7PFkulZ6o692uE/H/QnYbd+ZgbfqrFRNLMtopRztdoTg9DiTefYRLiAXQbze8K3ypToVso2 ydoQTg569U9ltlr+BteRiVjl1gPRMnOvwMYtUGFMwMw1nj7cfg7bRv7VVu0tqR7hhASm+lcajy+ 1tfahNSM9ziroE+kEsRI5T05VkNaHitDEQe7sG X-Received: by 2002:a17:902:c412:b0:2cf:6f7f:55d8 with SMTP id d9443c01a7336-2cfa6c79503mr22078505ad.37.1784782536916; Wed, 22 Jul 2026 21:55:36 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:36 -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 14/26] ASoC: codecs: wcd938x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:15 +0700 Message-ID: <20260723045327.28260-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wcd938x.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index c69e18667a85..9a9ea37ecab3 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only // Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. =20 +#include #include #include #include @@ -1976,7 +1977,7 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, int req_volt, int micb_num) { struct wcd938x_priv *wcd938x =3D snd_soc_component_get_drvdata(component= ); - int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en, ret =3D 0; + int cur_vout_ctl, req_vout_ctl, micb_reg, micb_en; =20 switch (micb_num) { case MIC_BIAS_1: @@ -1994,7 +1995,7 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd938x->micb_lock); + guard(mutex)(&wcd938x->micb_lock); /* * If requested micbias voltage is same as current micbias * voltage, then just return. Otherwise, adjust voltage as @@ -2009,15 +2010,11 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct = snd_soc_component *component, WCD938X_MICB_VOUT_MASK); =20 req_vout_ctl =3D wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret =3D -EINVAL; - goto exit; - } + if (req_vout_ctl < 0) + return -EINVAL; =20 - if (cur_vout_ctl =3D=3D req_vout_ctl) { - ret =3D 0; - goto exit; - } + if (cur_vout_ctl =3D=3D req_vout_ctl) + return 0; =20 if (micb_en =3D=3D WCD938X_MICB_ENABLE) snd_soc_component_write_field(component, micb_reg, @@ -2038,9 +2035,8 @@ static int wcd938x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, */ usleep_range(2000, 2100); } -exit: - mutex_unlock(&wcd938x->micb_lock); - return ret; + + return 0; } =20 static int wcd938x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *= component, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 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 655FD395AD8 for ; Thu, 23 Jul 2026 04:55:48 +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=1784782563; cv=none; b=mGmk7ICC8JIj/kcaTuuHrZ9bAs7jgr6tyLDm7EGTxwFT6AncyDB9O94Mm/KaFoYDZv8r1Kh9LiL48nx5rQxEuGeQm4VByuljXPLvy3zxEGWqx8wxWHQMgmdS6vVGkxO3nLlXfQOcqL1mGDDR8yTcRgoY1Cqyy6zPS9YlY3Cut3s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782563; c=relaxed/simple; bh=qfYAbMupB0dauUp98L0JPr8A4YLqYtXX8lr09zfUid4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N3fZH2fJCbVh6LYJk5bD2aHedxPX/5ZY6dGOoZw6fKEYMLibEgOrZd66DU+2X6WiXweRHSI7T0UoM9+VgnnsKoXjVU/nI74LDUlkK0tYu7PMJ/9Bt2myLoMHSG+x48R3Ew0H2s6XN9prGiVvlMG9WO28LW3x+BHx0dEmXZ1CGxU= 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=GSZdExym; 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="GSZdExym" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2ceaf8a1265so2805635ad.2 for ; Wed, 22 Jul 2026 21:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782544; x=1785387344; 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=lOLFIqbE35iIA1xT77FTcDNQ9ZNie7IeZCAAkiIj56o=; b=GSZdExymy+6FhHdzvSjiXVp5pCk8wi/y4ja2+lLcDnzEvoX5+SYJdoDXnpgEfOzV5Z 5U2AESlLzSZ0EhOEic/1fjGEziv1ix8ZsLf0jY9BfdmvuAVYimzIJaIvAFL4/DUXHIJN TeN5At0DeSUjNHut4uvPF8ielCNK+Tt0zeUpyfo9CsGiV3pXwOAEDnlo/G01REPrj2JB C3qyAu9+MrFuYudarVKdCX8EWgZ6e3ZKTUwwWTupRNeoN8LddKsFysfBX+TQeexydWnA qHyQ3nv5VxFb/xZPEKAGdSl+D4YyRmKb2zMmlRa65j8FBnLdK9DwRg8zBFp78gPisb2I T0pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782544; x=1785387344; 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=lOLFIqbE35iIA1xT77FTcDNQ9ZNie7IeZCAAkiIj56o=; b=V2nKM0q5TX+K0HBAOlGyJI7NqHyQNE76XIQ9Rjzu3FP3x89EkdLGgEe2WYy/gkJY8c P04b8luqghRtkhkVBF9n3MGkU/9ztrCFhGaa2gFX0iBZQzY+g4ibxZOmC+KhLDt2Ki2K mw3UYMbnYC92f0amGWkjIT124aev1IKdHYE/SqBHm6cAauSHdusvmi/coMeu4pMIh19G VDCCPDOtwfsrfX8p/8bbIfSgJ2UCRgQTo14CT4fRn8fd+o0MP1eKnfiWytZKjEfzrXz+ GuOyG5Il88AC/3/NGbcxDEyyoR1gnbePUCnL0sY4QwCAf8IDUInQDcl7fgm/hJX4w5ON T6wQ== X-Forwarded-Encrypted: i=1; AHgh+RpLAFttRJI7HiUDh3TKMnJdP1xY8SXqrSrVPlWUtgzvvuqyzfZVvjmN/HM2OBEF5v3YFyqkmJIq+JuHApE=@vger.kernel.org X-Gm-Message-State: AOJu0YxLGYTU8j4WoHV9LJSQUi8EU0PX5YGiqpIFm1fdMJbmVhsVuI1l cmsUaZcQNx/z+KutZF8cItxqV3VR5Jo9aLXyXlWI3an/NRY2OUcpN/3L X-Gm-Gg: AR+sD11MMNMYVNqyNcUZlEIHEEoQ3WdPWt6Rxp/C0iVD379oQNg/B2pu9h+c/sWlbIF KFWdTa/t4A3n7jzStUdOaMySmq+p1NPwtgvZBy00W7WGrRCmmq3vb3aTWaml9WB1zGSkjtpnf1m kCP5A+IM2uOqgFuySDpnXRG+UORBD4AGE2pGhZrANotGHaQAtevoXv1Q/jSQwGplMBYoQ171ps3 tlXoyQH92nKqXlVOdPNyWlK1UmvkyCk1cP0mnGsZ4MV1smUjXQRr2skT4t4taHJFke9kqqje33b MeWqdDvqcF9C3nOiEglN/htPLcGAf2iAUISE4TRr0Xkjuk+vaYjMtbA9a9sysYWVRI8BuucNyM8 rPiyPnOGSbgHBADt1VB9LfULC7X4rohe0w8s3m4ZE0Vigu998wpHx8ZxhnP5/xvUjA+ifSNaz2p 4nzl21ioaRpA+UrfRkSE/TqDpJsSPfHSymqfm00dAh0W0tfN4= X-Received: by 2002:a17:903:3508:b0:2c9:9a19:10c with SMTP id d9443c01a7336-2cfa71adac1mr19834705ad.40.1784782544311; Wed, 22 Jul 2026 21:55:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:44 -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 15/26] ASoC: codecs: wcd939x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:16 +0700 Message-ID: <20260723045327.28260-16-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wcd939x.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c index 010d12466722..26fe0b6313cd 100644 --- a/sound/soc/codecs/wcd939x.c +++ b/sound/soc/codecs/wcd939x.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -1923,7 +1924,6 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, struct wcd939x_priv *wcd939x =3D snd_soc_component_get_drvdata(component); unsigned int micb_reg, cur_vout_ctl, micb_en; int req_vout_ctl; - int ret =3D 0; =20 switch (micb_num) { case MIC_BIAS_1: @@ -1941,7 +1941,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, default: return -EINVAL; } - mutex_lock(&wcd939x->micb_lock); + guard(mutex)(&wcd939x->micb_lock); =20 /* * If requested micbias voltage is same as current micbias @@ -1957,15 +1957,11 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct = snd_soc_component *component, WCD939X_MICB_VOUT_CTL); =20 req_vout_ctl =3D wcd_get_micb_vout_ctl_val(component->dev, req_volt); - if (req_vout_ctl < 0) { - ret =3D req_vout_ctl; - goto exit; - } + if (req_vout_ctl < 0) + return req_vout_ctl; =20 - if (cur_vout_ctl =3D=3D req_vout_ctl) { - ret =3D 0; - goto exit; - } + if (cur_vout_ctl =3D=3D req_vout_ctl) + return 0; =20 dev_dbg(component->dev, "%s: micb_num: %d, cur_mv: %d, req_mv: %d, micb_e= n: %d\n", __func__, micb_num, WCD_VOUT_CTL_TO_MICB(cur_vout_ctl), @@ -1990,9 +1986,7 @@ static int wcd939x_mbhc_micb_adjust_voltage(struct sn= d_soc_component *component, usleep_range(2000, 2100); } =20 -exit: - mutex_unlock(&wcd939x->micb_lock); - return ret; + return 0; } =20 static int wcd939x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *= component, --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 6AF5739C015 for ; Thu, 23 Jul 2026 04:55:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782562; cv=none; b=Sx2F20kGYMIn/35Wg4oIi7OONDRVOa9Erb7TOvfKRD3JNcxGkxHeJOlaG/fqBGCDlOvWxi5+vKj2l9dXJO4ly621PHCNkfWCsSlMW+xEMd89MCMIsSTwtCvtOn8Aiu0nyKs6UQMFKLlOlS2ke8sZo8KxEd9RH9JLN4lyR6DWjbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782562; c=relaxed/simple; bh=0NQREOEMSYxL+uqmZetrbuR2obu3D+rDbZ0Tzl7F/ww=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFcYxNX7kF08NNOjuhE5ZQl2vOSVctCm362ZLS4VbZud9SL9n+ge9izN+mUo15VLP3pDrS3l4yhr89i0UACrY2DqnsRzReBnJ9mzZeSBs5DkmfsNpm3kh1lLyO+KCOzclcRcDy1ftCTgGtz+2TIzi+M6X8kI5n034TDtkNLdNbY= 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=MeqWN546; arc=none smtp.client-ip=209.85.214.180 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="MeqWN546" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2cc73e322dbso2566005ad.1 for ; Wed, 22 Jul 2026 21:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782551; x=1785387351; 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=usuTvoafYBlbhhxqvq4Yu+6sk7iPhWUYa3m7RcyQB+A=; b=MeqWN5461Hovsh0kK2FQo2ywpJcsdeuv7jo/AxVb4NmRpel7uWwaBRfdLGGgY8kHHd QVwBeT91y8oK9hB1HdswaXO1kOskbStYh+KfYFcaedBbVGc3H9a13JeYS4bP7bv+pFwT hbC6JG3K1HVlnBd3uwx68snhAETqqfpDUzg5HujTxK2d5jaUfp6WTGGEo/GErFA0gsFq ASJ1FPealodJnQ2Ck0poznGIt0FYxfv9xPVKyFL2lT0R8qkaNDQDM+UNTPc+2pOdvEqs fhcLYQ45giC/u94Y1uWT6JAvk8mW8sGFReg1s/ODrZmQVs/Qs3Vc+tgGPihIJLdnoiey vDbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782551; x=1785387351; 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=usuTvoafYBlbhhxqvq4Yu+6sk7iPhWUYa3m7RcyQB+A=; b=Yua8/iO50vydmLySfJ7JdUisHP7AZl4La9GfdCxw2HybRENOb8gxMGZye/ZTAYE/vD JEIAugVcGTjPCXXw57mcrEsEa/E4GhQ9in100J4kPVmhK93UAURxyGe5s1lE/zyzUdo0 e8xeNz80N00VHnOIPQN9uF2WMW3Ok1d+WHnnb2ZcBkOUqug9IzRPGfWbQb3pAez8DXcV uSt8O8LxXdD/NZVUDI9VOjxdecHzdFnkAMnesfV800tmDCEbQ2CjUyQmBzZ0qk1+hFuf ccr2aR3IxB6m2yaQhOBIa4KQ47kN2270IxMXapqg/xCxWQpLAFFUlJsVmgz4oEUQrzAD P4MQ== X-Forwarded-Encrypted: i=1; AHgh+RopBK2cQ4AQBK6JaPbcFbFeg6RBRsN7fwL5wdzsEF3IRIpkdvzfgffQ5/zu+xmdiCqPBpGQdPkYCC9AF9o=@vger.kernel.org X-Gm-Message-State: AOJu0YzUNCOBekY1/01lB4rBWVdJasAIbuY/nxpPgW+N8AcVhbeZfdHg zuLvZqWHnGH71X8Zabq1PXwC5qP0IoJK1ZSaPAUusNrgeV2/t5Ip7aSP X-Gm-Gg: AR+sD12G1EEehZDjYEwSHKvXuGXj0yBekQtu/qp/UiYmCvaGxQ378U/4gFfqdx82M2K uVMQdYOu/wPOqum2M98X5Sge/nzgW3YBxMYqgvQ3cVURn0BDArfAsd4CBn/dzsWBmG4SrWJR9KP j6boEaZihEURPW7/Oklpd/KPa2nDJ4WREaY4vQtVIc2Kbde0xuUpOD4HFOQF5wVmkJ6+THJhIxX xaSsiq1QKDe9DT91E74bnI4andAhc08/7r5ZsMQS2vGuE8SaonY0YlxZkM5LTow6TU05uQyydwk PRxZzuWRSQrXNLJv3EUzA3eTay6iYlHrQ0cxpDWe55z3rW4hWbtK0O57xaYkRy2/iiVEo4R8PLY dhNxlGAnxp5mcSoTS4104DKkrXWFga5we4naUftT+/xqcEgMeKbPbNiZfWWUXne+edLZL7vZdMm ROpRg8Qg64O/r2cRMwSLFSjhk2zhcXLFu9G2Mb5zvm+ILlf3Q= X-Received: by 2002:a17:903:2441:b0:2cc:741a:ff33 with SMTP id d9443c01a7336-2cfa6f97144mr20581805ad.43.1784782550964; Wed, 22 Jul 2026 21:55:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:50 -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 16/26] ASoC: codecs: wm0010: Use guard() for mutex & spin locks Date: Thu, 23 Jul 2026 11:53:17 +0700 Message-ID: <20260723045327.28260-17-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for mutex & spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm0010.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 2a8c61a72c17..58c0c601ee6c 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -9,6 +9,7 @@ * Scott Ling */ =20 +#include #include #include #include @@ -148,13 +149,11 @@ static const char *wm0010_state_to_str(enum wm0010_st= ate state) static void wm0010_halt(struct snd_soc_component *component) { struct wm0010_priv *wm0010 =3D snd_soc_component_get_drvdata(component); - unsigned long flags; enum wm0010_state state; =20 /* Fetch the wm0010 state */ - spin_lock_irqsave(&wm0010->irq_lock, flags); - state =3D wm0010->state; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + state =3D wm0010->state; =20 switch (state) { case WM0010_POWER_OFF: @@ -173,9 +172,8 @@ static void wm0010_halt(struct snd_soc_component *compo= nent) break; } =20 - spin_lock_irqsave(&wm0010->irq_lock, flags); - wm0010->state =3D WM0010_POWER_OFF; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + wm0010->state =3D WM0010_POWER_OFF; } =20 struct wm0010_boot_xfer { @@ -190,11 +188,9 @@ struct wm0010_boot_xfer { static void wm0010_mark_boot_failure(struct wm0010_priv *wm0010) { enum wm0010_state state; - unsigned long flags; =20 - spin_lock_irqsave(&wm0010->irq_lock, flags); - state =3D wm0010->state; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + state =3D wm0010->state; =20 dev_err(wm0010->dev, "Failed to transition from `%s' state to `%s' state\= n", wm0010_state_to_str(state), wm0010_state_to_str(state + 1)); @@ -734,9 +730,8 @@ static int wm0010_set_bias_level(struct snd_soc_compone= nt *component, break; case SND_SOC_BIAS_STANDBY: if (snd_soc_dapm_get_bias_level(dapm) =3D=3D SND_SOC_BIAS_PREPARE) { - mutex_lock(&wm0010->lock); - wm0010_halt(component); - mutex_unlock(&wm0010->lock); + scoped_guard(mutex, &wm0010->lock) + wm0010_halt(component); } break; case SND_SOC_BIAS_OFF: @@ -832,9 +827,8 @@ static irqreturn_t wm0010_irq(int irq, void *data) case WM0010_OUT_OF_RESET: case WM0010_BOOTROM: case WM0010_STAGE2: - spin_lock(&wm0010->irq_lock); - complete(&wm0010->boot_completion); - spin_unlock(&wm0010->irq_lock); + scoped_guard(spinlock, &wm0010->irq_lock) + complete(&wm0010->boot_completion); return IRQ_HANDLED; default: return IRQ_NONE; --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 0A16B39B96A for ; Thu, 23 Jul 2026 04:56:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782568; cv=none; b=TEAgQLYyYuYF8X52OC3ulBdH1WJg03RWVP6uAixk80GMEfKShWZTdFefGTiB9Nbw+EtFqH4Cg/B6CjCGiXMJyOGTtx5LOUmholZfAjmnzYiHCXFphY7Zr8FMUFOzMfXMKF24GEhALWB7rTLj1JYbBAVfJtZ8Sis42HFSkef258w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782568; c=relaxed/simple; bh=1Dpqc5x+KM5kx8uAtY04gCGPsEBNAbWrcA9xYsfntHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bi3HWnsxxwBzL9ik6FCPH5pojTuQjSLp3lMhxWUjsVfKUdXOXXgepTEbE7WcO760i6JoRrfO9crcwNbjDrEWbGNWonKcOPOMK46wei/M4WVuqv3SXf4UAojrHMFX2bBbQ3uKavzUNqtoo1yMxdQQ4vc0zeTSCAhcNitLoZ34Ck0= 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=BaIN08hG; arc=none smtp.client-ip=209.85.214.177 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="BaIN08hG" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2caf228a910so2164265ad.2 for ; Wed, 22 Jul 2026 21:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782558; x=1785387358; 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=UkLOpw0PU4ryhG2UScp9q/DeFzgBu9EIAOz0VuJ3SlM=; b=BaIN08hGn/I+lChSgY3QQ5Oy2H4Uuf+u7t4zujLFnsTenPr8RVFSnMxZNfKxz1il4u RcGglGEZl7gF0ZSPG+/dXylXj2QDE2i5v9EHeWfPfaCRDEzBQmXX0M28YyQ5kFnT2n4e 8GHcBOwOUK2nIWdryKL6pQFRlMKBg3fnIlhOX/gUdRRHTlGBiRnhpXmy8epPe68Szkmg aAq6Li0gVYu+K4o0qWlFnAgdybpWHkyqI9dGiLsVuFf0sUDLqykYd+3ybWHP1rME827f albhtM7nUdx0rarsE8zi9ALeN4DDop+tJE2Q6kb86fLrrahOaRpTOE83QGItqnxzJLsZ yqsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782558; x=1785387358; 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=UkLOpw0PU4ryhG2UScp9q/DeFzgBu9EIAOz0VuJ3SlM=; b=PEdaT7MOi45GO/bsoblnyJzbXiLkpeLmZtKLm8yHIgYqZDzfURw29wBUg6dmHe99wO W/Bv9MUSyN6d13Px5ew0x7+KnKantcOIvR8ueda01FexyYhitp7wA7v+AEKGWpQ9Xerx /rf04afhNvaALUbCQpkCMJTJB2n65EcU0GbKbrKkVGlkPKCJAcssisbu06YCg1Sk+U5f He3lpjKFg/jJm8FzIxNluPAVsVyAxlhTSEr26TPu5TkppDSncuRUQYwzdsABMpPvmImO gLOK7zMk+thtP8Ukw5+5/UGKoQxBcWDsHA+j8j1mLg5OqQ4NRZxWIJN5IFDPAWMR07uQ v0rQ== X-Forwarded-Encrypted: i=1; AHgh+RpUsK9Zp7EIBs2GLPr5mBgELURip+B45MR1H4Rq3wwCo64RJErjFuOlISdUNZLQ5Q6gmDN0hhx27ZZol/Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxJmsDTrngeGN71r4NCFZXyXHFBuiMKWMAxEr6BilFKnKc5jmXZ ot+L+kDqdW8qEXfAlRL1K9ofm7vzuOS4hLIlzlGWu7CyZCTKR3irgIX0 X-Gm-Gg: AR+sD10p1aLhXqoUTvVBS5vCxxQcl9uiZf0N0x2zgPCaHRpIR0Kh69TSaiCEjCdhr3m y6Bs3k+pofo9i4SRD2rd4ptbr6KyMpzKXaIr5a4JflJz8Z4ouGTdQzF4a0gmxsangGRTmpn9mUT 30g/qvDRwPhojowiogAr27ANmANLgSBl6iPKgpPN0Dw8perQiVtNvLmN3uDGczrM/7tsg2XfqtB nTRcQ3CKXMVMFve/im2KnKu6Ym2wQeobBZwdoy8BgyIc1X+OqRVVf9Rk8rBug7Sc3YWHsh+ymbC GFLtLskrjsoT5kJguhWEKF/L3ZfJTHdGmhQ1U8GNCfKb1KXyuBRiprkzsP8EmrIPa4hIHjIXkiC AMGHDjZ+9xffqsY1xBIz4Eikkf4reMd1YKn7amMaIO6xqFW+8POXvg/dNB8mJ772u6ba6mXWIkz JZQSqG0/ItCH7YJRwZ2PuLsbp//P2Nh8wQaA3c X-Received: by 2002:a17:902:d50b:b0:2c9:e69f:8b0f with SMTP id d9443c01a7336-2cfa6b7e369mr21647945ad.17.1784782558134; Wed, 22 Jul 2026 21:55:58 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:57 -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 17/26] ASoC: codecs: wm2000: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:18 +0700 Message-ID: <20260723045327.28260-18-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- 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 *k= control, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 =3D dev_get_drvdata(component->dev); unsigned int anc_active =3D ucontrol->value.integer.value[0]; - int ret; =20 if (anc_active > 1) return -EINVAL; =20 - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); =20 wm2000->anc_active =3D anc_active; =20 - ret =3D wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } =20 static int wm2000_speaker_get(struct snd_kcontrol *kcontrol, @@ -645,20 +641,15 @@ static int wm2000_speaker_put(struct snd_kcontrol *kc= ontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 =3D dev_get_drvdata(component->dev); unsigned int val =3D ucontrol->value.integer.value[0]; - int ret; =20 if (val > 1) return -EINVAL; =20 - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); =20 wm2000->spk_ena =3D val; =20 - ret =3D wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } =20 static const struct snd_kcontrol_new wm2000_controls[] =3D { @@ -676,9 +667,8 @@ static int wm2000_anc_power_event(struct snd_soc_dapm_w= idget *w, { struct snd_soc_component *component =3D snd_soc_dapm_to_component(w->dapm= ); struct wm2000_priv *wm2000 =3D dev_get_drvdata(component->dev); - int ret; =20 - mutex_lock(&wm2000->lock); + guard(mutex)(&wm2000->lock); =20 if (SND_SOC_DAPM_EVENT_ON(event)) wm2000->anc_eng_ena =3D 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 =3D 0; =20 - ret =3D wm2000_anc_set_mode(wm2000); - - mutex_unlock(&wm2000->lock); - - return ret; + return wm2000_anc_set_mode(wm2000); } =20 static const struct snd_soc_dapm_widget wm2000_dapm_widgets[] =3D { --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 795C839C657 for ; Thu, 23 Jul 2026 04:56:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782578; cv=none; b=QrfbVO7CMP8Y4nHn8SCkCRwTX8eFByFgjLugjDTJedyd1aGF8yl8RYD8rEP1Q+h8WcDz4shIYaK3Gq1VQmsx3C2MDZ4047eX9uYxSjSDPMfE8HmEV8dlSQLRQp78/BBDgGbTtr5A/5wtUBam01y/FXczdRTDRAF/VycFwnIVRZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782578; c=relaxed/simple; bh=vhQNcZw7Vwuw+2mEaZrrAwX4ICzGoAV2kKF+a5LkSM0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KXzH9eVqAfs+X8uhCL3oroKisHqlui9Eln4eNSgrK6aW+Yb6S35WMtxE8KyDFHvR4wX3/G6NIQnOWU3g+WKoH1KQfT0jmo+bXQZJU/dTANi2FHscTkgWSGW8fKVVQTpKwF9s1POUBaDjSP/4HaOU2TTfiLU0SNnMOoGijm2AdAQ= 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=rrKRhYrq; arc=none smtp.client-ip=209.85.214.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="rrKRhYrq" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2cc891373e0so2817795ad.2 for ; Wed, 22 Jul 2026 21:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782565; x=1785387365; 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=ok4tGf8ERF2To39hRUrBqxTeX6IvjzaUkkiuJi5gDOQ=; b=rrKRhYrq4Y92gQuENolZWWlDgGdIE/xWt5iSHO2IeK3CteRdWKSKOMZwqgjmYlJ2KP rndhdFuwhUt4kKKOes9qaZ/mikuG6+gegjqx60cwEHPniNokWI2TUeJUSDjlGWohHhvb UJu1ioXurTZxtLfdzxPkyniomFSwNj1KmnnQ8W+Z3iE8jbeCwtBnCn2urWnV5IuqZY8C k+vgT2fqjDkIHGo7GTVtNY5KFRxD0eErLmTS81jvLYnV+hIqX9prujEJknxwHFYw/oFU wgNxgfI+XpoY4BdbDxPXJITqrS9Gw/c258Pq7wuHyCuNFTjyqWhuAA1MYTzCSsaLeTEI VNhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782565; x=1785387365; 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=ok4tGf8ERF2To39hRUrBqxTeX6IvjzaUkkiuJi5gDOQ=; b=ZZvEkkLG8k4OWByGIvROqCnkarGhn+/6EpPQR2P5c5d0lsfxLTVP3kl2CC2hxVD531 aNxoEkepKIue2jDsC2DuDC5QBsNY7cuzY1G8vlG+lM+BZAzkkC3ieOERFuqpxAeKOGzd MWJ6/uDKhOQulytZmpXDTtFXeRpA9Ru81BkUbGZPnWKXdn2GoqCpjOCsTJbqsrhr5t5d 1I/hEVcyX4fTWFdpgj0QeWnCD8GdHh4/9UYhbkXAIQc/9mzey1fkO0Ebe7YPcx3t2Zp2 zEU+N0jYNKU7obajuUb3JdHA5QNf2lqSCYcHZu5iUWro+ybAR20jQJUqaL+TDYkt1jLj 612g== X-Forwarded-Encrypted: i=1; AHgh+RoO7MZyKGxRZKsAbZZ4/qx+0FWYTbWvCNmT8i77MEU1BnUvUquip89eVtQVW7z9+QUzc7TyxjIKQVn6NlE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz59ajMzPU/+x6sV1JHieP/V1LOn86GyHXUHtKph+lRFxNYzDSh uxef/QrFIDR5bijdnaUGP1Wz3oGxu+sdM+KoSVNIeNpxxFRELhdMpePN X-Gm-Gg: AR+sD10ewAhR0Rc1wQE9kAQel8tFVq9NJUB6jpbGW+NQLbOih1KeggKBAavg6/bWeWu VgJf4jvKwIeRh9MrnrdJL3GzD8UQzZ6yu9K41Zxob6QfjSumhqbLMyTKI6zHaHbqeJdutw3AO8+ VzNG7gWbX/LTNGTX88mEVug8G4Unja+ww5NY+EuyxdSqhBKVgb/SAiW6QDKsmXaMOzatV2Ox7n6 0voXbOPeUyIYqhl5TDx64kPobXI7lXeVqGLiFM8HkDVSN2+jSRqXnW8BdWJ3WF7/NYgZJfVnxp6 IBr81ypv9kq84UE7eM8bkyVu90cfO2L0IFlAmVwcHCimpY9DiOjZdDUDsvCPUUObd4WTOYF+hkb hSkepC2j1sqfwsFrq7tHqRbCp5kGxm+91IlbpRZtlyztRPX2vqndrw5XN7kxcsVlfFw78q+tSBH P6MMgMrY9CEiU56ghDdJU9OGWj/MfFsQHNAyul X-Received: by 2002:a17:902:ecd0:b0:2c6:9f6a:9f6f with SMTP id d9443c01a7336-2cfa6c66734mr19973065ad.28.1784782564905; Wed, 22 Jul 2026 21:56:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:04 -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 18/26] ASoC: codecs: wm5102: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:19 +0700 Message-ID: <20260723045327.28260-19-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: 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 */ =20 +#include #include #include #include @@ -667,10 +668,9 @@ static int wm5102_out_comp_coeff_get(struct snd_kcontr= ol *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct arizona *arizona =3D dev_get_drvdata(component->dev->parent); =20 - 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); =20 return 0; } @@ -681,16 +681,14 @@ static int wm5102_out_comp_coeff_put(struct snd_kcont= rol *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct arizona *arizona =3D dev_get_drvdata(component->dev->parent); uint16_t dac_comp_coeff =3D get_unaligned_be16(ucontrol->value.bytes.data= ); - int ret =3D 0; =20 - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_coeff !=3D dac_comp_coeff) { arizona->dac_comp_coeff =3D dac_comp_coeff; - ret =3D 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); =20 - return ret; + return 0; } =20 static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, @@ -699,9 +697,8 @@ static int wm5102_out_comp_switch_get(struct snd_kcontr= ol *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct arizona *arizona =3D dev_get_drvdata(component->dev->parent); =20 - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); ucontrol->value.integer.value[0] =3D arizona->dac_comp_enabled; - mutex_unlock(&arizona->dac_comp_lock); =20 return 0; } @@ -712,19 +709,17 @@ static int wm5102_out_comp_switch_put(struct snd_kcon= trol *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct arizona *arizona =3D dev_get_drvdata(component->dev->parent); struct soc_mixer_control *mc =3D (struct soc_mixer_control *)kcontrol->pr= ivate_value; - int ret =3D 0; =20 if (ucontrol->value.integer.value[0] > mc->max) return -EINVAL; =20 - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_enabled !=3D ucontrol->value.integer.value[0]) { arizona->dac_comp_enabled =3D ucontrol->value.integer.value[0]; - ret =3D 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); =20 - return ret; + return 0; } =20 static const char * const wm5102_osr_text[] =3D { --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 7093A35F8AB for ; Thu, 23 Jul 2026 04:56:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782586; cv=none; b=BT+mKScVANE2ymrrS7b2hUJQNatbQOW8i9fspQcc8a8Tia9mS0WpYjCqmhjIXrqPGAnSx1Ae0hnd7dI90Co6J2L/cYCaHTS4epeP9X/U6VzFwvr+WY2VXjJyifdHITQ1Dq4eWMQPlGZ2hyxAs2s4Hk5RvkBWPDa8AaSKB1/H+E4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782586; c=relaxed/simple; bh=2Xk1hXvsA2IpLifbN7YBERIeU06kepyhohGyxFLXL8k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RjbXSGP2rohOxD5oytIZr6DHNrG4XPeaVEnAW8L+dD8au6EdkDMzis4fXzZvSmnZlyYVq2U/CczAcVzh8h+a57WFXxks6iW8NZA/jkdLhtWcrb/3Tg6+lQhgy5vJrlJM7g16MTUVMsSNvj0s1pnk1OZ+c4Bhe7g13PiCbA+Yhc0= 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=cewA6Vnf; arc=none smtp.client-ip=209.85.214.174 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="cewA6Vnf" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso2468575ad.3 for ; Wed, 22 Jul 2026 21:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782571; x=1785387371; 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=DsESuYKzKzZpwopQsJDBDE/AgD8FvSh3g/JSOgCHZBM=; b=cewA6VnfJuT7f34D9OWC2XsBMGycusJp/hYnxVBE2X9PRHLbmJ5MlPl7amCByBpSQU zwCD4FJsqrM8mNqaK6va1zB5UxuQ20ZbsGgekAisZWKBqKWyrPtke1O+B5iVtCOA1ufH Ph47NYFrH6SWueuj+uGSDXGLUvaOyOXD5k1fari35wIgb7OIu/DfEMxDLpfgsO2cuMoh ZccHuIRyhe16vaAYR0yYmB0UmyhGsARlCrY8GxiqZa0m5bpbC8CEYuyiZUmy2pHr2/+z k0coJ2Q0tc5PxEsNb1RPtoCtgU0+1XjQKq5gQ/aZcRFMZJM10KrF6Tn33Wtm0koWjk8H 9w8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782571; x=1785387371; 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=DsESuYKzKzZpwopQsJDBDE/AgD8FvSh3g/JSOgCHZBM=; b=TQrlB/AfUU03EN4aQAmTSvEwwRU9gASu6166X/eO8NKoJd1T46gEs9DFc8aQTtx/Fe /J73NGpkIv7ZEaXPLJyYKkO/5poPYhF7crdMDXXdyTVtQeA8DtG/c/sf+dYTjCydl0/E ii9MJhFpVX/QxZMZb0uCQxA+FlBLz702Xy6NHGDkXJnzqv57X9oK4iF2hXwzqDfrE2fj 5mLhif5dPrl+ZUWrUtXCVfaLeG4G1chRMUYYu65H+RK7B25/tghNpSFV2MqchUF/MCqL RwbCDN4pvfOfRwKTDZ66hU8Fxsku6T3tsSYu/5ccyxl9fEIq0iaAAuheiV06+vanaTvI gsiw== X-Forwarded-Encrypted: i=1; AHgh+RqeCPMVAvWZ+Z2ss0pFA8NrQaYmiiUjCCiieKySsP4pD7Yj8ChwRoiZ4K+UxWT8lwL2BXxFnW/k0YkBDtM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0Vbt4v4pcECDduuUlwRpOXY4ETtdKlbkeq3gKJKg85Pk21Y6N kX8zlr2mYm6Yq92dAKBh7vK4qcY6PhHCw8uL/4fGO8/BLEjz4ebUHnoi X-Gm-Gg: AR+sD10cHayR+3V8xj1zBa6vYXfkKoVyvD28mVHo+dxfxPVzgVJ7B49IVeQOXaNzqCx 0yN9OgoIg0AQQLiJGvODPvd6vTTUwh5pu4LUPpDf0fKG+4+NalL5pMmvGYYvywXt9Jyll48+okG qEaoGo3q+BbKDiU3pZTO9c+k1CPUYrW695fRZERvNrnUQtXyZVgJNNVPeqmvMaSITPfb1TlSB8H 2HoAbtrhRlsPye5GFGgzo1zuRi0yfWXi9U39gGIKT8K9qDZ9wYCC/M1WGR8R4E+8STw2esbzQxT oSSFEMSnfGtiVRbttIbtqLTqPP0XLrT9OlaXGThOh1F2qvzxpuPb4fsSyi8seAwjnFKbjlRG14+ qMmGr9LQvqyyZATtXGNbs7AW8r1rYRUyvY1Gx4PkoyyUMMJXpmsflbJ8NLyOUdz0Xo8VWoYy7Ob 8qNusQ3MctmT31N/tjuVd8cLW4qOZrjdaa21K1 X-Received: by 2002:a17:903:2ec7:b0:2ca:4b7a:4a02 with SMTP id d9443c01a7336-2cfa71ce943mr18539775ad.43.1784782571078; Wed, 22 Jul 2026 21:56:11 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:10 -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 19/26] ASoC: codecs: wm8731: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:20 +0700 Message-ID: <20260723045327.28260-20-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm8731.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index a2f0e2f5c407..ce87280d590d 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -10,6 +10,7 @@ * Based on wm8753.c by Liam Girdwood */ =20 +#include #include #include #include @@ -110,22 +111,20 @@ static int wm8731_put_deemph(struct snd_kcontrol *kco= ntrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct wm8731_priv *wm8731 =3D snd_soc_component_get_drvdata(component); unsigned int deemph =3D ucontrol->value.integer.value[0]; - int ret =3D 0; =20 if (deemph > 1) return -EINVAL; =20 - mutex_lock(&wm8731->lock); + guard(mutex)(&wm8731->lock); if (wm8731->deemph !=3D deemph) { wm8731->deemph =3D deemph; =20 wm8731_set_deemph(component); =20 - ret =3D 1; + return 1; } - mutex_unlock(&wm8731->lock); =20 - return ret; + return 0; } =20 static const DECLARE_TLV_DB_SCALE(in_tlv, -3450, 150, 0); --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 DC8F237CD32 for ; Thu, 23 Jul 2026 04:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782588; cv=none; b=nFJH/n396gppegj1QyaN5MDHwxNx9gSfLqvIrXQp1Ri5Xs7XI3vVHJa3GM+h/xVAvkQM+KQ4QkuMhCAuRp0ujKLkrQ3rzpvSIgTQBWj6z5mrqn3QRjTNo4n/HKSAjeYXT36oJHhqGtKNmwoH/tAfYFrp+7kGDZqhO+Jam89Y1/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782588; c=relaxed/simple; bh=yBK2UCUmSQSFOpEtB+8KHiI8/hJRWMYuBBrJOg0oZWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kg3lkk9WTxv9CoUSXch1dH2NuMHwQBamP5qP+A4O8b+FeSfHO0jgOmaVm69wkIItkruas4h9kZ+rDGh4//GzgcY/GtwVCBsP/hxuan8LDo2awHYqgikLIKaYGaM+fQgwAVaNvXJJ1NzweX0/d+2Whb2CeroApCo3YCgnTWa8uQU= 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=e+/hlKr6; arc=none smtp.client-ip=209.85.214.180 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="e+/hlKr6" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2cc891373e0so2819715ad.2 for ; Wed, 22 Jul 2026 21:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782578; x=1785387378; 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=7Md3Lv7WH7OCFvrmgVPZDMLRQIfXY7uimwN9Zh0AdLk=; b=e+/hlKr6p0jKsUE4cDAUvfkDqboecn2EUu9SvT15nKcThgEfqRVlVlAAWeO/maQXyJ t9H3R/SLbQRwsSt5mQzN6pw/oiOE/bDmLxq2ND4YH0FFdmRaTcIL8xL6cJsYC0nVyHXZ frcMOQ/vs10pIZfb9bFkIZ56bOd5KmoGWy+5xQ0fYeqbOxP6WuGZpIsfYjtGkkkhw2bT yzZc45mMNC5ZRgV25RfyPrCDmXSY859GlQe/yl80vkL7h0pWyXgejvTBqF9kK0oLxi4O pjW32MrTQh767z1AH1QIeioBwWVKlM0zB0f5Qc8/dKqX1Ss021mCQXwPBH06uvK5L+uf TvDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782578; x=1785387378; 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=7Md3Lv7WH7OCFvrmgVPZDMLRQIfXY7uimwN9Zh0AdLk=; b=S/ssQmb1lwxscLeAr9T4X5o/upet54JHPEIpHEw8cix67an5Gtf7RuGSNYnOH0Xtqw K4TqtXGL0Agle7XdSIR8QP749ktTitnK+Ws4GdLHhcNGZJo6MaB0hWPztX9OUil7nl6y db3psfr9PT3ETQQ2h0XNRmXQMvooASCNWa77bF8kRxdoXjxqLkpgxopMj9PpTaL0J98G X0IXPTiD8IskjFVRUEyd56jWk8wtEmjZl7Us2IkCF4nkkYEaxrGfr3L49hghlc2b7cCo 61dm/PntI/AzVwE1iwNK+ZogUDdmwJXaXWSwHR5dQk6fbA5k+ZLyloAjMk54HNxIsHWw BkEw== X-Forwarded-Encrypted: i=1; AHgh+RrCcYH45c9ke9o/ezpkw4rpUzeScMqWUyZ1if9il60EqURxo4IjzQK8EBpNMXfM+17YlqQFra9QDUDOSr0=@vger.kernel.org X-Gm-Message-State: AOJu0YyFKd9XrSUIRI3DaM4TjKOwLNELiBr6PrtY+Fe3CUucJN1GPPM1 kDryga5r+gb/V+C3f5lpPEDLqbjoSEd/gyRxbFTjIB1kRyzneYdd1Hn3 X-Gm-Gg: AR+sD10ohaGgTsyQQhoiWMV9jcqLGSnnuc449pgrXk6BIXvcKO3IVfTp/wZk8RHq5vV +FP+bnQNhGFxIqE7r/Sj3sSKIf9HkaIybXOODn78ytwwgN5AVOzdfIrP5XHrm/l0PeXQOtleWn/ n/t3KvuvcfV9Wvu/58YXcfK/uJ31CqjUeX2BVnemM6k+w/FUOtUZq/PBe8XrhO2vCr++SeWzgKV S0qgc0KS/r0ra74riNfGu/WQTPsmTIME/N9jXJ6THETSCtsq4IhgClrF4o9MLO3FuExY4R7Mi17 F3u1pY1prJPALz0gDV05w5RBCCqhmO+mc/kv5C+uwtdzD6NjGo4jZQmQk7JP/0knvT9hK4UWBIG JFoSHsCq+egLto5VeNS8NJetmjOQlaTeXrSNOfKTBm1mZQoZ9VdruDN7Qi0R0HfuLCCdtKjzVap DbXdYcCboRSFmkzQgBL4TmP5a6PSi7kL+y36MD X-Received: by 2002:a17:902:dac7:b0:2c7:ebfb:618f with SMTP id d9443c01a7336-2cfa6b73a76mr20511265ad.14.1784782577702; Wed, 22 Jul 2026 21:56:17 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:17 -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 20/26] ASoC: codecs: wm8903: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:21 +0700 Message-ID: <20260723045327.28260-21-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm8903.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 320d7737699d..156e1e24a388 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -458,22 +459,20 @@ static int wm8903_put_deemph(struct snd_kcontrol *kco= ntrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct wm8903_priv *wm8903 =3D snd_soc_component_get_drvdata(component); unsigned int deemph =3D ucontrol->value.integer.value[0]; - int ret =3D 0; =20 if (deemph > 1) return -EINVAL; =20 - mutex_lock(&wm8903->lock); + guard(mutex)(&wm8903->lock); if (wm8903->deemph !=3D deemph) { wm8903->deemph =3D deemph; =20 wm8903_set_deemph(component); =20 - ret =3D 1; + return 1; } - mutex_unlock(&wm8903->lock); =20 - return ret; + return 0; } =20 /* ALSA can only do steps of .01dB */ --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 8C14736A34D for ; Thu, 23 Jul 2026 04:56:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782604; cv=none; b=nVmHi7gO3V7RK5kWbPMoWh4O04JFCRa+lHGU7MAR4imOq6ZSIC0gMCC97IWC4fEX32U1QqpWn6XZ+ycGtZXuYnAt3tICVuQEzXBgkxwg6kx2yCUBeMzx0rAI6IX2PxFCYDHZLbI8P2sIRepdIo0j3SAVQ5k1wo5ObOVEAolPqpE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782604; c=relaxed/simple; bh=K0qNNfC3kV/sDligl/YtVeKeS0f+6Ya3lXb6LENAZSs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FwBYsYHYr5UnqIsrcDqzP9MX5eTKUCL9kParinJeswPfvEo+7Tjm8z05YnsEzAzpDVkiW+oENIvgJd8+nkLBXiyzcx75zLIT8H2mTfdm94wy6syRrVsgtvqeeD93EWBqumrbUFeF4iPvf5mhYSEuO5Sv2LZi/n/i2yAEbot69UU= 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=L+THBt3O; arc=none smtp.client-ip=209.85.214.181 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="L+THBt3O" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2cf452def93so388505ad.1 for ; Wed, 22 Jul 2026 21:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782584; x=1785387384; 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=6nAKMdocPGkvuO4NtwVmzSRSgTeiuWi8Ahf/iUqF1PE=; b=L+THBt3Ogue/f6u48xoVpyL67PRwJjV6FiIRb6FMd0fmJMJmihBRUUIvB6oXgCCnk6 ga2njBwBxb4xQpzBFVwu8p82wJxMY/cTjAOp+OGERaqYX1OagtCNUqGKnJQ0j5tOORVl WDQAOW8eSE1u97FCKUHEqepvbxJ553IKXXDpIdpBjJXnxQ/UKMrC+qKMC8bAP1f4ygkF rqe+vTnQ9WXlZzyC6/yQmIKQI1nw17MSpe8l7toXoP2kyTfOGUpxk7+ejrjVJxsTrXOW EAiZouE8OaG7cuzGEfx+hP/vu3s/uOR7EzvsbiYQ551F4aVJHNVIuq0kQ6cs7GK3BA3h NVWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782584; x=1785387384; 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=6nAKMdocPGkvuO4NtwVmzSRSgTeiuWi8Ahf/iUqF1PE=; b=lMZGfIJiR6RL4un8nb5ZnMPYxTh8r2ito805qEjr36eFIqcWgqSelAz9aQoOcidQe+ dK+CGbQ6d+yZ1aWoThIsh10doqbbvZ/iae9xTnewlRl3EZzv6H9JEhLaSk4WnNwMvFGR OZGPipWASZ4Akz2Jj7OaRzyuHlhUbAhN6pvUSwikd68sbUIvsoTNT7w3DWzRA56pPa6+ pKtlYyh7eqX2sXWndM+dKpNANxjgSoovIeAhiEDC/UjceF5qUfq2XAGoAdC3GYfuEtLC FuWAx+oxyHbHn06qzTyccY+0+XGz34ROtumGdPxanGaVudTo9pjlmZ/CkU5uR0Ul4k+E p/NQ== X-Forwarded-Encrypted: i=1; AHgh+RoMHQwUym7emyTNLpS3F9LiID/ByW6cSo0bwMsitNHsZJvtIZq24G8OzUAhO4qQbSgdAyWbHHy9lx1uDck=@vger.kernel.org X-Gm-Message-State: AOJu0YyqDbQ5fbJAndv5mHzDUmXKxl8kskn6QQiP2wdjuskOUQQY2Exp rDG3j1yrvYhOm/XWukI4CyTg64/S/8DW1zSVkpv1EEWS5XM651RFkO6I X-Gm-Gg: AR+sD10JVUXtlSOUm+/p8EdXEESueHqpK55t1paspNlhfs6ErnFHfFnETo1gb2VfW2J 2BbtTn/vApTKUAC050IsywUgK3fy/nweQk905LDZvQJZosRMhmiFMT7SXQqwxOErDBP4FmnGhDI SvCO5YS/05XKsUYMnEVIguVagcvig+WFRcbk7Xtesj6wqeCc6Sqv6m07WId6k0yJUh8qxlgrb22 gvXCTMBvKpm6EMluZ1Rioj1bZ6yLWKTNWsV4bqjQN07lzyMNIGjTvYk8BwpVfotzYUV2uC6t+Hr p/mu21Wzav0Kso+RUtCRoML6wG2S+iVlmraMGXxtkTYjVjgM4Q2pHwdWyDyy3Bqj94UO7ur08aW +eH8LOXPTTLR/CO+C5EZ9UyJRq2969+B+gsQIQIBi8eE4v41jSGDZZu0UR1iDBVjktDSnPmF3BI rv6pBUsrRpJ8k4yThMfHTYA0ePJhoQG4nU+pCc X-Received: by 2002:a17:903:2406:b0:2cf:41ba:96c2 with SMTP id d9443c01a7336-2cfa94ce6demr13480345ad.12.1784782584053; Wed, 22 Jul 2026 21:56:24 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:23 -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 21/26] ASoC: codecs: wm8958: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:22 +0700 Message-ID: <20260723045327.28260-22-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm8958-dsp2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c index 8ff0882732e7..f75a6dc9d2bb 100644 --- a/sound/soc/codecs/wm8958-dsp2.c +++ b/sound/soc/codecs/wm8958-dsp2.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ =20 +#include #include #include #include @@ -864,9 +865,8 @@ static void wm8958_enh_eq_loaded(const struct firmware = *fw, void *context) struct wm8994_priv *wm8994 =3D snd_soc_component_get_drvdata(component); =20 if (fw && (wm8958_dsp2_fw(component, "ENH_EQ", fw, true) =3D=3D 0)) { - mutex_lock(&wm8994->fw_lock); + guard(mutex)(&wm8994->fw_lock); wm8994->enh_eq =3D fw; - mutex_unlock(&wm8994->fw_lock); } } =20 @@ -876,9 +876,8 @@ static void wm8958_mbc_vss_loaded(const struct firmware= *fw, void *context) struct wm8994_priv *wm8994 =3D snd_soc_component_get_drvdata(component); =20 if (fw && (wm8958_dsp2_fw(component, "MBC+VSS", fw, true) =3D=3D 0)) { - mutex_lock(&wm8994->fw_lock); + guard(mutex)(&wm8994->fw_lock); wm8994->mbc_vss =3D fw; - mutex_unlock(&wm8994->fw_lock); } } =20 @@ -888,9 +887,8 @@ static void wm8958_mbc_loaded(const struct firmware *fw= , void *context) struct wm8994_priv *wm8994 =3D snd_soc_component_get_drvdata(component); =20 if (fw && (wm8958_dsp2_fw(component, "MBC", fw, true) =3D=3D 0)) { - mutex_lock(&wm8994->fw_lock); + guard(mutex)(&wm8994->fw_lock); wm8994->mbc =3D fw; - mutex_unlock(&wm8994->fw_lock); } } =20 --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 898B139B49E for ; Thu, 23 Jul 2026 04:56:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782598; cv=none; b=eWH5OrLDf6Dg+8Re1ZRj/R1X2S2KdULsc99q7xpXs4ocrWMe6sTa7q1zFOYpSMn3oN0ygSyhCLKHngMp2qF+/qXwQbpl/2S5shZNppGyjIWBqOM/ZcAN7ztunstkpvk92u8xi2f15BxQEaK/kgVf3SrlbuXO4nF/ySR1cCpq1qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782598; c=relaxed/simple; bh=mTFpbE7y3C+2o7mpAVBR3/EaCOyAljsg1tywzWeZ7gY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g1yI5FYDghay9kr8CXfGQt2/ChiKrZMkPzuIlOh/7PYpb5MCR0XTOptazzs87/c4acNnQWmF5VzCvXh+POE/ZSfmtOfxxfSFfUXOSVBVGV3AFVnAUORqpvZNjzPxKucjGbUxz/F/3TwMOU/bczEBDhmo3kURdWvgTxfWLHbIad0= 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=a6mrd0YZ; arc=none smtp.client-ip=209.85.214.175 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="a6mrd0YZ" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ceae1ed204so2228185ad.0 for ; Wed, 22 Jul 2026 21:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782591; x=1785387391; 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=2qqyvFlsAJpGp08mEcLtsqWSAzW5XWPBTBAzSWZnfs4=; b=a6mrd0YZkIHxLi4ckfh1lZoTYS87DUn2J33GMTQby2aqb09DpgtZVUWbOMQE4ekx8f t2SBlyOIXrY0JnEgQbBLzEG4q6+gXefqtNm6sCc91edJny2rUddhqwui6YdnQS2P1Mpa t+rirL31kj011rXaePXdmNSOrhZvbJ/CsQlHp+sJZqCKIH6HZSReLuYWxT87TwWOFrda OQPTQ6OEFKfusRwakNkCHeV5dBLvHl/WyW7z7jSD6eKYUwqXIBg5eRAvm49McdtijPIg 35Oj58k7XiesnrRvQRm82hzOXmUfOE3JdNssTP1eyGvPer1NQpsVWh3Gg0rjg0moARx3 aiKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782591; x=1785387391; 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=2qqyvFlsAJpGp08mEcLtsqWSAzW5XWPBTBAzSWZnfs4=; b=pWrt+a3wY71CMkCmgs1XC5uMEVBinGS5/VUlIto19cOe026Y+ZY7+gdmd7C8yfR3si Uh+rTmThGdfriT74o9WUdYXK4oP7TysgtkRMwK2kq4bN0JdPXjwBGzwO4ewenBSeFg7J UllZbNIf1R7zkfVMczqYBzRFcHA7qu53x4eFZiiklDMMKgH65lc80FtmzWtsvCD6i8ps 5bAwGidjzkGBiwR/Kmg+X4U+jSQMqFc28zseQhHaIhp5TIlAb2dG08w03InKZwQXkOKU 9oIypZpx8ekCitvdXUy9EJ+rISxx9iakGd2rDFO/rJAENDK8eFeWnMYYymsP9Eeh6xIi 9EoQ== X-Forwarded-Encrypted: i=1; AHgh+RpW/AOHY7JIzMACHrxAWJcrbYQJyDkV7Olup0TlzXooQaHz0lAC1FVDPQHWis1UEOS6StyYRspjdYHH6+Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzPwGm81tHHku57Tpd/byPRzEGKvb4zc7q+ZiGtpSjANzpK86EB /m1zTZYVVtUUqpxwlyL2eMlfmxQqPvo0REBZ+ffQ3uj+j2ATnGnqdiz9 X-Gm-Gg: AR+sD10e0lPX5KYKC6EXa0t5Z9RmSaU/n3FOmMsrrDgFebcD7RGXcECATX99DcnyuX/ 6LSAcch3I7Igp5aEUf8es5JzkhAOoBmoOpBNpxRWrG/4Dz2088ncph9egm/WaNQqmCZpZ1CqVxq iumiARlkxZZNsYUuOofDvGFBvZqWC0LJta1xhbbKXXbknxAdxWOSpPb3YI2QAP73CJ2raCfhGSr ZPLUQKKS32qBP+LJdck33qZUV3QeCVK8Mg5k6Y9BcX+LwTaVCIwp1jO9IHhTa3HyROF/Lv7ZFbl Ovt9Mp5coT750rMYFdEv92yBuuJLjGI3POtHaG9KdDItbTTda2CZv0OTMkvQbYDg/50nqBFNVQ8 dC55qfoBcw4KnmffXV0Fo/iBFCcuhQwPjDcpVqpverVblFM8vf/cAdkqC9s3sKZpF96bAZLmcu7 rI8kCTUIhfpFoq523cG+h0e+eiUAvFwG29jYL+ X-Received: by 2002:a17:902:e801:b0:2c9:8f4a:90b with SMTP id d9443c01a7336-2cfa6a54e47mr20230015ad.3.1784782591028; Wed, 22 Jul 2026 21:56:31 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:30 -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 22/26] ASoC: codecs: wm8962: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:23 +0700 Message-ID: <20260723045327.28260-23-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm8962.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 2db822fc1de7..8a9598161b35 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -1564,11 +1565,10 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol = *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct wm8962_priv *wm8962 =3D snd_soc_component_get_drvdata(component); int old =3D wm8962->dsp2_ena; - int ret =3D 0; int dsp2_running =3D snd_soc_component_read(component, WM8962_DSP2_POWER_= MANAGEMENT) & WM8962_DSP2_ENA; =20 - mutex_lock(&wm8962->dsp2_ena_lock); + guard(mutex)(&wm8962->dsp2_ena_lock); =20 if (ucontrol->value.integer.value[0]) wm8962->dsp2_ena |=3D 1 << shift; @@ -1576,9 +1576,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *k= control, wm8962->dsp2_ena &=3D ~(1 << shift); =20 if (wm8962->dsp2_ena =3D=3D old) - goto out; - - ret =3D 1; + return 0; =20 if (dsp2_running) { if (wm8962->dsp2_ena) @@ -1587,10 +1585,7 @@ static int wm8962_dsp2_ena_put(struct snd_kcontrol *= kcontrol, wm8962_dsp2_stop(component); } =20 -out: - mutex_unlock(&wm8962->dsp2_ena_lock); - - return ret; + return 1; } =20 /* The VU bits for the headphones are in a different register to the mute --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 8D5563B5314 for ; Thu, 23 Jul 2026 04:56:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782613; cv=none; b=UZnqpHiA8aDP0NAIpD4+GZkpyucRPD2Taxi7Pc4uGqM5kOHhvvE5yfB+hHOhx+Bj9LuaprFcgcD9pZPPsnlfbh6OSE6GE5vv28qIIBvOofd9/3vesDDORXmtaOTGUlLutH9wQ6WYdyRRs+8jhnJ1jyhx9fuUlR2+FRShxtsxuIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782613; c=relaxed/simple; bh=KqAC5CfghReh2XEUZdCyPHf/60ZDneJJTZawuY4RN3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rlxchNoyzoyXVsrFeTgdMwp7aGyKhnnONgEmKeUrrXLT3bEFOX33tmg43qUbK6E3it+8Pju/PEFO6QyuJw0JQbcsE9fFzDuGm5VZ2aEWmTJZXH3G1IqDBjYCeK6y8aHjV96+FrwANJ12NuTCDAkFHx14m5WyaCjPS8Z1h3RFeko= 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=NbS4WJkI; arc=none smtp.client-ip=209.85.214.182 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="NbS4WJkI" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2cf50c6f235so3504505ad.0 for ; Wed, 22 Jul 2026 21:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782598; x=1785387398; 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=zejrRaxeptAqKq1X1ixMpC63mc2lZ8YAiu3QcPsJINs=; b=NbS4WJkIdKvz0N+EbcEVlb+x1jE+nAsVZWStm283msySmAfEEG+RRhA24rp777Gpa8 R0G80h/rCHzA/bHItQP8q7JN3dG3s4tZ5DXQp5PDpf7bQjjbTSH4P+na4igt87mzaMVA Wu+GixMiiQzP5rB0QcZG7IgqxJ2cRJgFfhZZX+C4DnHmsR/InxdPGEIoiPiZR+M+GWPp Z2MnRFCYzJNuekokcMHXZ79HrJyWZeMFvUZLmeUw9TUFz6u3Hjp7RmqyCygpVEjc40Wh BZV5g+tpbAn0tVU3DEQioq75XHb8AuceguWb2EMI+p/S6Fwj2lsIqlffgPKXzXJx3rR8 U2gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782598; x=1785387398; 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=zejrRaxeptAqKq1X1ixMpC63mc2lZ8YAiu3QcPsJINs=; b=o596Ot/ngOyHYPXXehUgvQ6I3kKIWdpGmPGwnqjlZQYLkibLnqHSpMBXWJY84xkLuB gT5Wu7uLD7bNCE1MCL7pVht+NYCH32Yi9iupA2Tpi74VJFl1vt4Q5awfCWdXJVfi0utf yeMhLeL5bKLGwann4klSlWT39Bg97acdHIg8CHcnquscIHGs62UeGHTRXqjJ9ge1/mNc vdLx8IwWwQ3l/+d5V5zSomxhu4l/Cvs9cOghVjiAXzDPjpYpZc/NAzziy9lsIzf17FiK HPlN8C26BuHT6qTzAOwgzZR5ZKggxPs6DfacPHg6tqlPAkmEzLMF+XdNon04OXG1pz6w XmbA== X-Forwarded-Encrypted: i=1; AHgh+RoWmSAoDA9YgzWmzDkQH6mGuZxTmHPsXY7Cq6+Gq6XLJw8ryIsuWwmRXXMBd45Eo697OrKq0vn2YlT2XqE=@vger.kernel.org X-Gm-Message-State: AOJu0Yxo63X18yrXL7qhfzxjRIVR103v4mro2NMQ41DZTycNza/2kXI9 5axfL6FH8VCaUBQOWE1zXFpd3hrU49tKzGcn4mjsm4QRhM9pZyZDdYTs X-Gm-Gg: AR+sD10x4412i0SDsYEX9lLnRIS+DmGQW8Dj9T9Ivov5UjZ/zw+cvEKecphqi2s+CtL O9FTRWd+OK6nAwoD5n1CNvxzYE3ea3LM/QGYp2Z4UHFiHO5KWa19iRKlSIT0tYjOuQkwZS78f+M hmOPYfzdFanO8q3qzzuTEHgdzYx6YdjFeVsGbGozsa+2SOtkL4WAe8byUM134GIY242dO9JLlWS Tf7+QQPBoIKYRF9+xmODxyTUrG7JKHjTgb+IKNyk8FV9saBdI7Xw28A5ch9dK4Lvg/QhNvkkonp P9lhZXKxeRwItneAdE/G7QXc28+qvzswMFlIOHPvv+pmYshQAZfov2dh/7ukSOSjfGuZ2lnGsTV ChC4hJYcBwCKoMOpZ0x8HHJmA02+pHOFbdcr26wSBfjM1Gecy21hfGcz7RSHpbps9tFfCg0UXpl PDYSPbjJaElYI+cJ7S3tCW2EwFl1FsvKxWiR2q X-Received: by 2002:a17:903:ac4:b0:2ca:2753:f3cc with SMTP id d9443c01a7336-2cfa7506cdemr20165945ad.33.1784782598017; Wed, 22 Jul 2026 21:56:38 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:37 -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 23/26] ASoC: codecs: wm8994: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:24 +0700 Message-ID: <20260723045327.28260-24-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Fitzgerald --- sound/soc/codecs/wm8994.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 1d64c7c42ed1..8bf58a6a8af7 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ =20 +#include #include #include #include @@ -766,7 +767,7 @@ static void active_reference(struct snd_soc_component *= component) { struct wm8994_priv *wm8994 =3D snd_soc_component_get_drvdata(component); =20 - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); =20 wm8994->active_refcount++; =20 @@ -775,8 +776,6 @@ static void active_reference(struct snd_soc_component *= component) =20 /* If we're using jack detection go into audio mode */ wm1811_jackdet_set_mode(component, WM1811_JACKDET_MODE_AUDIO); - - mutex_unlock(&wm8994->accdet_lock); } =20 static void active_dereference(struct snd_soc_component *component) @@ -784,7 +783,7 @@ static void active_dereference(struct snd_soc_component= *component) struct wm8994_priv *wm8994 =3D snd_soc_component_get_drvdata(component); u16 mode; =20 - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); =20 wm8994->active_refcount--; =20 @@ -800,8 +799,6 @@ static void active_dereference(struct snd_soc_component= *component) =20 wm1811_jackdet_set_mode(component, mode); } - - mutex_unlock(&wm8994->accdet_lock); } =20 static int clk_sys_event(struct snd_soc_dapm_widget *w, @@ -3704,7 +3701,7 @@ static void wm8958_open_circuit_work(struct work_stru= ct *work) open_circuit_work.work); struct device *dev =3D wm8994->wm8994->dev; =20 - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); =20 wm1811_micd_stop(wm8994->hubs.component); =20 @@ -3718,8 +3715,6 @@ static void wm8958_open_circuit_work(struct work_stru= ct *work) snd_soc_jack_report(wm8994->micdet[0].jack, 0, wm8994->btn_mask | SND_JACK_HEADSET); - - mutex_unlock(&wm8994->accdet_lock); } =20 static void wm8958_mic_id(void *data, u16 status) @@ -3777,7 +3772,7 @@ static void wm1811_mic_work(struct work_struct *work) struct snd_soc_component *component =3D wm8994->hubs.component; struct snd_soc_dapm_context *dapm =3D snd_soc_component_to_dapm(component= ); =20 - pm_runtime_get_sync(component->dev); + guard(pm_runtime_active)(component->dev); =20 /* If required for an external cap force MICBIAS on */ if (control->pdata.jd_ext_cap) { @@ -3785,7 +3780,7 @@ static void wm1811_mic_work(struct work_struct *work) snd_soc_dapm_sync(dapm); } =20 - mutex_lock(&wm8994->accdet_lock); + guard(mutex)(&wm8994->accdet_lock); =20 dev_dbg(component->dev, "Starting mic detection\n"); =20 @@ -3803,10 +3798,6 @@ static void wm1811_mic_work(struct work_struct *work) snd_soc_component_update_bits(component, WM8958_MIC_DETECT_1, WM8958_MICD_ENA, WM8958_MICD_ENA); } - - mutex_unlock(&wm8994->accdet_lock); - - pm_runtime_put(component->dev); } =20 static irqreturn_t wm1811_jackdet_irq(int irq, void *data) @@ -4026,15 +4017,10 @@ static void wm8958_mic_work(struct work_struct *wor= k) mic_complete_work.work); struct snd_soc_component *component =3D wm8994->hubs.component; =20 - pm_runtime_get_sync(component->dev); - - mutex_lock(&wm8994->accdet_lock); + guard(pm_runtime_active)(component->dev); + guard(mutex)(&wm8994->accdet_lock); =20 wm8994->mic_id_cb(wm8994->mic_id_cb_data, wm8994->mic_status); - - mutex_unlock(&wm8994->accdet_lock); - - pm_runtime_put(component->dev); } =20 static irqreturn_t wm8958_mic_irq(int irq, void *data) --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 88990393DCD for ; Thu, 23 Jul 2026 04:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782617; cv=none; b=XoZqAVlCxLwdWDOG3jZVUk81Qsjrfbl82FHqwFPzgkt8/1j1ElXvQHMqcDZdOWMnayIxDtKXvPMUtEtAdQGPGrbBll4XORn2tzQiNoFhDk17XJ+XA/b6q2Z6xBL8DWQy35ne5ufEXrUmtu2pgrhnNr/DcrJQHBqYuxFaFHquggU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782617; c=relaxed/simple; bh=Drn8APp5Uw6rYTgsK/ubGCbMdZovD7uDbrhOiuvrAPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hhO/JOmo4h0gdF/CVeZhcLI8rUX1HPmL0KhpUPPeIJk0CA2m9pMfv3ANQmjR5L4zU3jeSRAHUceIP8J2RQmdTbiZPC3JfriCm2muGWJshgvX9sx2HAJZs50ht6a3Qbs4gGiHc0nqtB3kTX8d8FY+uZw7BbTGpei7tJIL8kapgYE= 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=OYB6f3xe; arc=none smtp.client-ip=209.85.214.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="OYB6f3xe" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ceae1ed204so2230375ad.0 for ; Wed, 22 Jul 2026 21:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782605; x=1785387405; 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=OeWw6h5jytB2MGM9QIlVlvrzPpa8kERJj1qhZ9lmXsU=; b=OYB6f3xeyetL56gcT6B9geaavkO1stAqR4SNgAiSUk4ai7kv1DnDEfRTl0i6Sngoc4 o85DtGRMj85KOwd/rIczizzXY9InE6CWm84OnCklxyDmATfJi04uNytG1XZznef3Glnt DmEvTk9tlrrJQyTBvoAHTaKagMNRkHAaVmnN/BdlJWccJZuFG4i1kZ+Otfgmv4Ur1FyD SVzAho1mFgs+ruxA2mkyi6Bidhvpr0Jk3pgrHEyNnKO2ilksWstUnSNF0DD9vc1i/FXb IA13GCtdudlMCvfb2S+c6T/utdKT+J3pXotcCNKmt/TB/AIS3jXZIFi+pC1k+7bybkng 7Jlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782605; x=1785387405; 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=OeWw6h5jytB2MGM9QIlVlvrzPpa8kERJj1qhZ9lmXsU=; b=GiBsLckwsatHCbFnW55xYzLaxCMbDNxFm2HD07kvak/DdveLshYBXZ77J9u2uMOMag U8w4XFqLKvXcBW/tcs+XKqGNjqp6J9/0JuyBiERop0y8uwzI0kUBc3reJBNd4v+A2Cn3 CGS3XBviIUdhxUNJKvS0aIL8F3mdvaPcoXpOIXYd/zwD3w0XheWw062X1OVxwMyCCO6T QhEf4miR2+ctakG5JWhSZ7txkKX4ZBNc5zxmqT3m86AQOZFGhUqKgbrshyRjkC6xiIOR GkGVZxuVD/bGiGsBIz4170M+hC0C+c3ktZAHdX9yjxKZXRDTfeQ28dvUEfoH6QU8ohES Fp9Q== X-Forwarded-Encrypted: i=1; AHgh+Rqx4TxyZThNqyplk1HIKQDMBy22e+9Yw52iS71frteGtE4ZWezF32tjKpDtEQe08+rznGL+MIUnx3ANEJU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq5IVggLeJ72dgE5bud93afYxXH/Ec4sS4S2RsX7W/yXnAeRhY d8vCeosgEIgh5WMxwJAtkfRkP5ZLoTgYsRMcqPaAwHwNwWUA2di0awh/ X-Gm-Gg: AR+sD101vLZ3ekdacg3zGM0y/4ONqSqgj8pImwR7EVVsD09dLqJyvkaz0JQRVlbPljw 502g+oYeAiKcY2pYzozdb9YXECYJXWFKCewPDT2VzLAUWeDtRYpsfKE6kkODGqVHe1rMW2eQtM5 RtTEnLU7tMSZxjwBCm2DCECS+PLGQsa9am3VvfavsEGcSvhy+yoGyoNADSFEg4256lER9+ugH7+ PgWZrdy5Baxkp38uDM9Lpd9x43xjPvePOtS0oc0HrorAk18pFANElAyvwnVTiV8A3FBPNGCi7pg VoD6GImGvNPF7offNT3p83jf5GKS2ms80QEH+nGGKErY4msBnOlToa27N1jy0wv48fyyGTB1ULg O5+cbUmvbGeM5aUNcCWC12/PxAZTj6CnvDZA18TLjndi2EpLf7L5x0YUjDzITaDSmS4FMd6K+mh e0gE/t+KwX15m40KAYcwB3TK4fnFLyv1Ud51KH X-Received: by 2002:a17:902:d491:b0:2c2:62ee:5a0d with SMTP id d9443c01a7336-2cfa6b77547mr21829445ad.14.1784782604968; Wed, 22 Jul 2026 21:56:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:44 -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 24/26] ASoC: codecs: wm971x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:25 +0700 Message-ID: <20260723045327.28260-25-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wm9712.c | 5 ++--- sound/soc/codecs/wm9713.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 83cd42fa0c28..3105b2e0556f 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -6,6 +6,7 @@ * Author: Liam Girdwood */ =20 +#include #include #include #include @@ -229,7 +230,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kco= ntrol, shift =3D mc->shift & 0xff; mask =3D 1 << shift; =20 - mutex_lock(&wm9712->lock); + guard(mutex)(&wm9712->lock); old =3D wm9712->hp_mixer[mixer]; if (ucontrol->value.integer.value[0]) wm9712->hp_mixer[mixer] |=3D mask; @@ -251,8 +252,6 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kco= ntrol, &update); } =20 - mutex_unlock(&wm9712->lock); - return change; } =20 diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index b3bbecf074ee..3ba7ca3c1770 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -11,6 +11,7 @@ * o Support for DAPM */ =20 +#include #include #include #include @@ -238,7 +239,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kco= ntrol, shift =3D mc->shift & 0xff; mask =3D (1 << shift); =20 - mutex_lock(&wm9713->lock); + guard(mutex)(&wm9713->lock); old =3D wm9713->hp_mixer[mixer]; if (ucontrol->value.integer.value[0]) wm9713->hp_mixer[mixer] |=3D mask; @@ -260,8 +261,6 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kco= ntrol, &update); } =20 - mutex_unlock(&wm9713->lock); - return change; } =20 --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 AE632399D08 for ; Thu, 23 Jul 2026 04:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782624; cv=none; b=KUc+nEsgk1N7N3RGGqU2pTJf4lZeCVU95UI9ZfXk7+HNUAWvE42DGLOIaWzH+CVJz4/Q4uwQTK9T7NkdoevFTKmoBIQi3Q+lkIrSdYbkpYsRrQcpnkd/dnJSVzlJY1DzSXW/jBpe+fo72Q/x6mAc2l4gs/BEA8cBP6jMZU+7Zp0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782624; c=relaxed/simple; bh=Nwz58X1PCnQd0Jse3bQ1ZJ1IieSp/vhqwgf6xrW+MB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CalsMA3gDT0YxOVjkZhgS/WlU5e66b2wtNwtj/D0xReeFW1I9VSEi6k8WRXxvVyqv99uSI/PmUPmCTCY+JPylCCO5C+EvsRI/DhI5E+X7uPrpWCHmtkcRdq2e8IWtnW/O9xunwihMzEN8XNyBFWwe3fOt5SdP3SDYGcrAA/pEE8= 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=hPCdS0v0; arc=none smtp.client-ip=209.85.216.48 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="hPCdS0v0" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-38759bcd877so191168a91.2 for ; Wed, 22 Jul 2026 21:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782612; x=1785387412; 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=vph9mPIOkBC69ufOR2Dc/z1d7siOErcoyCyrp5zLzUg=; b=hPCdS0v0FH/2kHfo/wNE4PJlAwkPvjWmtXY7S2GwR7A/IL1GqIvjL1o3wtsEKgP0TI bO8kBNRz6cd9+fu/wf57irqbdqIJEKKgXjzTAFdp/+hutN4o8Xn5xOCCIzzDV23bSpYC Mn2GLp4INjkOqztBkH8ayqjisT5i8AMQs/bhvknnFU9te3XKMd0T5X4WhYtuAVutak+Q qyeZO1qTOPMBWpDXxVzQk9GBkw/D4zUCOwWRBj4qoFb7GeBuAgyAyfqM8t7NLnt/I2zp sxaS55S1ogl/CyF+jlO2cxb7dmM/PPyRSvS3LHEUhOzMUH6AJQtSJyKoouo2lzbiuPMd e5tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782612; x=1785387412; 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=vph9mPIOkBC69ufOR2Dc/z1d7siOErcoyCyrp5zLzUg=; b=NOdXa7Yp8fy/TNryHnkSkrfMUonMtJhhkeWzbP9a5Yv2gZl3R28de373TTllnv9bYW P09WR7dY/STNWtDlrOA5wauMcXVQawD4EmOWGQ3D2C7jq5cPpwvIoPB51TT/JULBc1CG s6MNGwTV9ZGLWoFn/C2+YYQ9hqmhrhcOXZ0AW+iVHlWnEQw+6BqF5KlIM3Oyms8ZOyes dP96hLfcHcJK8tmqp5rdrhRy9bYhsUhDA7gcC3VShz01q8UqDdREVfuWGlwo1dzzJraV czTxk2lcpzwbxJIQAaxHh4BdgYoKn9/6hNisv/7tvj1B1Vnx/Jj18WBGKyHlWB0LiuwM 9DTg== X-Forwarded-Encrypted: i=1; AHgh+RoUey8K9ureaRaqN+RbT4B/BiCoGx1gGlHOuMJDhfnUZUYpnNx6jVp1zegYLjLYh9Q0obGARHy+CPGdrOY=@vger.kernel.org X-Gm-Message-State: AOJu0YwfYo4EtKqxV3fo9cT5N7iHIlWh6OWELbOBWm1CD+y0hYy3Cax4 cg/Au/EktX1CTaqKYbRcNwcgoKsWZLx0636+iq/ey2OD7TFx6oivY1zq X-Gm-Gg: AR+sD10W63rg+Ar8l2136WfCtWhUkLZyzJ3QC3CuoRsTu4ZUFFKfYyI7HhT26tV2G3z yj09XZ7wsA8G2SSegdBDgUgOIFIReg5DPdadIXzVDK8lxoFs2IJROTM89AbgSFCfZqPR8wxZ6Bg VM232xbZMX7l8o951OI6bRCx9ddjlJO+9IOLECnGWViXYsl6LbUSse9ytnbHZqMj3Aw//7Hl2Dx f9DNPb25Fx2IIssJKmwpPr0qlUtTRO1Id6VYbwwqq37sjGU99VacNyDCJdqBydmXz5m7JDsoj49 EPUlnTERrkP3djNEcJIlnCC+FlMrqmCbzXHYnKMKoOGVDfcc7w2iAZUV21fouV9IUVNfFTcN+uN 60LzYwhy4+XiAW3O99X/rT0p5S/J0Da8nn4E1T/dr5RINqAbkkuZpzjTOqSSZnkJCnTsIkyhgpS nz+CAx8f6eqsJfTRseQHxwCQ3ZbORwVA0pp4n3 X-Received: by 2002:a17:90b:384a:b0:38e:753f:a6b6 with SMTP id 98e67ed59e1d1-38ec698b6d0mr1404882a91.17.1784782611962; Wed, 22 Jul 2026 21:56:51 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:51 -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 25/26] ASoC: codecs: wm_adsp: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:26 +0700 Message-ID: <20260723045327.28260-26-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wm_adsp.c | 77 +++++++++++--------------------------- 1 file changed, 22 insertions(+), 55 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index baa75e7ff53b..cef8472dda8c 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -348,7 +348,6 @@ int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component =3D snd_kcontrol_chip(kcontrol); struct soc_enum *e =3D (struct soc_enum *)kcontrol->private_value; struct wm_adsp *dsp =3D snd_soc_component_get_drvdata(component); - int ret =3D 1; =20 if (ucontrol->value.enumerated.item[0] =3D=3D dsp[e->shift_l].fw) return 0; @@ -356,16 +355,14 @@ int wm_adsp_fw_put(struct snd_kcontrol *kcontrol, if (ucontrol->value.enumerated.item[0] >=3D WM_ADSP_NUM_FW) return -EINVAL; =20 - mutex_lock(&dsp[e->shift_l].cs_dsp.pwr_lock); + guard(mutex)(&dsp[e->shift_l].cs_dsp.pwr_lock); =20 if (dsp[e->shift_l].cs_dsp.booted || !list_empty(&dsp[e->shift_l].compr_l= ist)) - ret =3D -EBUSY; + return -EBUSY; else dsp[e->shift_l].fw =3D ucontrol->value.enumerated.item[0]; =20 - mutex_unlock(&dsp[e->shift_l].cs_dsp.pwr_lock); - - return ret; + return 1; } EXPORT_SYMBOL_GPL(wm_adsp_fw_put); =20 @@ -450,15 +447,11 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kc= tl, if (val =3D=3D 0) return 0; /* 0 means no event */ =20 - mutex_lock(&cs_ctl->dsp->pwr_lock); - if (cs_ctl->enabled) ret =3D cs_dsp_coeff_write_acked_control(cs_ctl, val); else ret =3D -EPERM; =20 - mutex_unlock(&cs_ctl->dsp->pwr_lock); - if (ret < 0) return ret; =20 @@ -486,15 +479,13 @@ static int wm_coeff_tlv_get(struct snd_kcontrol *kctl, struct cs_dsp_coeff_ctl *cs_ctl =3D ctl->cs_ctl; int ret =3D 0; =20 - mutex_lock(&cs_ctl->dsp->pwr_lock); + guard(mutex)(&cs_ctl->dsp->pwr_lock); =20 ret =3D cs_dsp_coeff_read_ctrl(cs_ctl, 0, cs_ctl->cache, size); =20 if (!ret && copy_to_user(bytes, cs_ctl->cache, size)) ret =3D -EFAULT; =20 - mutex_unlock(&cs_ctl->dsp->pwr_lock); - return ret; } =20 @@ -694,10 +685,9 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char = *name, int type, struct cs_dsp_coeff_ctl *cs_ctl; int ret; =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); cs_ctl =3D cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg); ret =3D cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len); - mutex_unlock(&dsp->cs_dsp.pwr_lock); =20 if (ret < 0) return ret; @@ -709,14 +699,10 @@ EXPORT_SYMBOL_GPL(wm_adsp_write_ctl); int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type, unsigned int alg, void *buf, size_t len) { - int ret; + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); - ret =3D cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, a= lg), + return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, al= g), 0, buf, len); - mutex_unlock(&dsp->cs_dsp.pwr_lock); - - return ret; } EXPORT_SYMBOL_GPL(wm_adsp_read_ctl); =20 @@ -1270,38 +1256,32 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct = snd_compr_stream *stream) { struct wm_adsp_compr *compr, *tmp; struct snd_soc_pcm_runtime *rtd =3D stream->private_data; - int ret =3D 0; =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 if (wm_adsp_fw[dsp->fw].num_caps =3D=3D 0) { adsp_err(dsp, "%s: Firmware does not support compressed API\n", snd_soc_rtd_to_codec(rtd, 0)->name); - ret =3D -ENXIO; - goto out; + return -ENXIO; } =20 if (wm_adsp_fw[dsp->fw].compr_direction !=3D stream->direction) { adsp_err(dsp, "%s: Firmware does not support stream direction\n", snd_soc_rtd_to_codec(rtd, 0)->name); - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 list_for_each_entry(tmp, &dsp->compr_list, list) { if (!strcmp(tmp->name, snd_soc_rtd_to_codec(rtd, 0)->name)) { adsp_err(dsp, "%s: Only a single stream supported per dai\n", snd_soc_rtd_to_codec(rtd, 0)->name); - ret =3D -EBUSY; - goto out; + return -EBUSY; } } =20 compr =3D kzalloc_obj(*compr); - if (!compr) { - ret =3D -ENOMEM; - goto out; - } + if (!compr) + return -ENOMEM; =20 compr->dsp =3D dsp; compr->stream =3D stream; @@ -1311,10 +1291,7 @@ int wm_adsp_compr_open(struct wm_adsp *dsp, struct s= nd_compr_stream *stream) =20 stream->runtime->private_data =3D compr; =20 -out: - mutex_unlock(&dsp->cs_dsp.pwr_lock); - - return ret; + return 0; } EXPORT_SYMBOL_GPL(wm_adsp_compr_open); =20 @@ -1324,7 +1301,7 @@ int wm_adsp_compr_free(struct snd_soc_component *comp= onent, struct wm_adsp_compr *compr =3D stream->runtime->private_data; struct wm_adsp *dsp =3D compr->dsp; =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 wm_adsp_compr_detach(compr); list_del(&compr->list); @@ -1332,8 +1309,6 @@ int wm_adsp_compr_free(struct snd_soc_component *comp= onent, kfree(compr->raw_buf); kfree(compr); =20 - mutex_unlock(&dsp->cs_dsp.pwr_lock); - return 0; } EXPORT_SYMBOL_GPL(wm_adsp_compr_free); @@ -1741,7 +1716,7 @@ int wm_adsp_compr_trigger(struct snd_soc_component *c= omponent, =20 compr_dbg(compr, "Trigger: %d\n", cmd); =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -1777,8 +1752,6 @@ int wm_adsp_compr_trigger(struct snd_soc_component *c= omponent, break; } =20 - mutex_unlock(&dsp->cs_dsp.pwr_lock); - return ret; } EXPORT_SYMBOL_GPL(wm_adsp_compr_trigger); @@ -1907,21 +1880,20 @@ int wm_adsp_compr_pointer(struct snd_soc_component = *component, =20 compr_dbg(compr, "Pointer request\n"); =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 buf =3D compr->buf; =20 if (dsp->fatal_error || !buf || buf->error) { snd_compr_stop_error(stream, SNDRV_PCM_STATE_XRUN); - ret =3D -EIO; - goto out; + return -EIO; } =20 if (buf->avail < wm_adsp_compr_frag_words(compr)) { ret =3D wm_adsp_buffer_update_avail(buf); if (ret < 0) { compr_err(compr, "Error reading avail: %d\n", ret); - goto out; + return ret; } =20 /* @@ -1934,14 +1906,14 @@ int wm_adsp_compr_pointer(struct snd_soc_component = *component, if (buf->error) snd_compr_stop_error(stream, SNDRV_PCM_STATE_XRUN); - goto out; + return ret; } =20 ret =3D wm_adsp_buffer_reenable_irq(buf); if (ret < 0) { compr_err(compr, "Failed to re-enable buffer IRQ: %d\n", ret); - goto out; + return ret; } } } @@ -1950,9 +1922,6 @@ int wm_adsp_compr_pointer(struct snd_soc_component *c= omponent, tstamp->copied_total +=3D buf->avail * CS_DSP_DATA_WORD_SIZE; tstamp->sampling_rate =3D compr->sample_rate; =20 -out: - mutex_unlock(&dsp->cs_dsp.pwr_lock); - return ret; } EXPORT_SYMBOL_GPL(wm_adsp_compr_pointer); @@ -2063,15 +2032,13 @@ int wm_adsp_compr_copy(struct snd_soc_component *co= mponent, struct wm_adsp *dsp =3D compr->dsp; int ret; =20 - mutex_lock(&dsp->cs_dsp.pwr_lock); + guard(mutex)(&dsp->cs_dsp.pwr_lock); =20 if (stream->direction =3D=3D SND_COMPRESS_CAPTURE) ret =3D wm_adsp_compr_read(compr, buf, count); else ret =3D -ENOTSUPP; =20 - mutex_unlock(&dsp->cs_dsp.pwr_lock); - return ret; } EXPORT_SYMBOL_GPL(wm_adsp_compr_copy); --=20 2.43.0 From nobody Fri Jul 24 05:21:24 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 2C4A13B9942 for ; Thu, 23 Jul 2026 04:57:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782629; cv=none; b=WTTtHapDVFuZWuY4jnpZ68svtK1lG+jc3IxASgh43Jj6ULtYCxt0AqhIsjqB8R/lSiN4AtkMBO3nnny+S9afyp9Bd/OHDuo0WgxlWPOXnhZfX1jY2ol9OXyT4lWqwHAo7tEpeBXd3pBMdnXJEDoPpqKxAwY2K0UV4Ft8z1Nan80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782629; c=relaxed/simple; bh=chor1/9GogowF9EJgZy2hFJZE1uubwSj8Yvkq6IYPwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ds3h7WYnN+GanIIK3Si+ox9Fc8aUO2nv+V1hyoGltx79Og6VAZNFpGB7YYB6bINczkww/0R9oOkktL38xqo9Q74rLzy6YINl4k83Kkm/bxwTw1bgf1TVz5EO9rTG9qkgZtFdam+868QWATuSrNUIzDHxKtTkUd8yNVmFgburN94= 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=pIsyuLNs; arc=none smtp.client-ip=209.85.214.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="pIsyuLNs" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2cab973140bso3040775ad.3 for ; Wed, 22 Jul 2026 21:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782619; x=1785387419; 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=lljKBSDJsjI6QypuaswVsYuIZiZ2Rt7j69Hl6k2jRSY=; b=pIsyuLNsvCOTet65M3VZbgTmVXubR7rtEyYeCqLamTNOLL3/tyJvlD/NpBHco3OysJ 5R1gEeMdnHLcsdMxB1ETkKQ7VfXHo7m/xSiHoR2Ke+wT7VO0LCgsbySEJyaf+2AVIN9H Uj45sJhHnMEEC0uzBl5ejpLK7IMRO2Smd4//sb3tlp0+CMHCDjJnKOZ61CTRwK+2izGn hZhQBJoT3qi4A02OsYDUDioxkIUUatpRSUa4+Ig0TVkZjdHLhxWkSLBMBRkdouy8n0/t VB57hU5YWpUWGRFQCjbmyL6hRQWsp+NcnM/fKiWBAMzZrpCbm70gJVOFEaTORzuLefsj 1pRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782619; x=1785387419; 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=lljKBSDJsjI6QypuaswVsYuIZiZ2Rt7j69Hl6k2jRSY=; b=bQCRtATUIhamg2FtW2mgAxIgYhNjgfAKoHx9J59mfpd1QBAgxO+hVxQc5qQbI2Ghm2 PIpD0Ed02xX4Qgxdcouy95rKRamNz+OAWw71MauRvXqh5uNukqjM3oUTKjIxTEDAFnOF NQVGxzy0c8stgJ3tU/XEJ1XUnQFwcsrZFbNHQEk8WW9S3le3msuuXr7+htLvoBB1OvBq 1NDx33qdL3K8WeWKorOzXPw2ge84BfpfApoFJmvgIpBWTabf2z3Cp1UakcuVsHLB7NXQ QBXh9Ks+qy09J6J44gUG4gaBDp1TPUdUzkJ2TQiTbAqrgudHCYh7ku6Ep0CXuryxA8SP oC3Q== X-Forwarded-Encrypted: i=1; AHgh+RpC6l/9ZC7LJCXVu1eEasNK1Cpk2hVANd1VcpYYK1JHNhJk7QBZlBAYMw/cPZ4geje7lqL4SToe2RZgISw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2nEk9QIfGouSZ8pmyf9SFWMXKhs4eGXX1mGQokMy40hQsbUWh sC6JTfzusj9toEGX7YS2yCmsadTPktFBXpQzk6oAQ2ceT1M33qzZoRE1 X-Gm-Gg: AR+sD11c8dTs29pLrfzIJFW3Uh92eU/HioAHQ5OoVAvHqWSzTHfYIWcpkupZAgBDkEM SXig+L/wUiDPkQm256YWM6VuWJ8QuXnql7LcfKep0OZV0eq+wLAoHeScD9xwNmyyM9VAt8K3awS X/m6YOdBZ3Bktue0urtJavhz9/814jl1Y1AHDz6UEUNCIltsZlha9fR/y/9zuT1ZhUdE1xCow8g OYWg/yTKDFr5v9kzu+4PcAqHmufeDqyiReXE6WmjLFgv/qj9qQzcTrizQ1KdCedLmyl8dP2L6dK eSJAD3vDGeO0fbPsLDcH4zIPmrPeqcKqShArLc8bkw5zN3hD1VIRioeuJvBdfuyZ/9aDEBsk/ko MKef2bPnxwmzJowG+p4Axw2MF7E47Xi9FubtyQ4r5Dd2gyHnz4uhG41HjT+5X9VAtuGcKQltJy3 0phtpyDBVcmMqGSwOKKQMFDlzeIluzeojgThCj X-Received: by 2002:a17:902:d50b:b0:2c9:e69f:8b0f with SMTP id d9443c01a7336-2cfa6b7e369mr21677055ad.17.1784782619301; Wed, 22 Jul 2026 21:56:59 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:59 -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 26/26] ASoC: codecs: wsa88xx: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:27 +0700 Message-ID: <20260723045327.28260-27-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/wsa883x.c | 11 +++++------ sound/soc/codecs/wsa884x.c | 10 ++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/wsa883x.c b/sound/soc/codecs/wsa883x.c index 24a5904d8e6c..442cf9f3eaac 100644 --- a/sound/soc/codecs/wsa883x.c +++ b/sound/soc/codecs/wsa883x.c @@ -4,6 +4,7 @@ */ =20 #include +#include #include #include #include @@ -1237,9 +1238,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_wid= get *w, =20 switch (event) { case SND_SOC_DAPM_POST_PMU: - mutex_lock(&wsa883x->sp_lock); - wsa883x->pa_on =3D true; - mutex_unlock(&wsa883x->sp_lock); + scoped_guard(mutex, &wsa883x->sp_lock) + wsa883x->pa_on =3D true; =20 switch (wsa883x->dev_mode) { case RECEIVER: @@ -1290,9 +1290,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_wid= get *w, WSA883X_GLOBAL_PA_EN_MASK, 0); snd_soc_component_write_field(component, WSA883X_PDM_WD_CTL, WSA883X_PDM_EN_MASK, 0); - mutex_lock(&wsa883x->sp_lock); - wsa883x->pa_on =3D false; - mutex_unlock(&wsa883x->sp_lock); + scoped_guard(mutex, &wsa883x->sp_lock) + wsa883x->pa_on =3D false; break; } return 0; diff --git a/sound/soc/codecs/wsa884x.c b/sound/soc/codecs/wsa884x.c index 567861dd42ad..a367c94bfb4d 100644 --- a/sound/soc/codecs/wsa884x.c +++ b/sound/soc/codecs/wsa884x.c @@ -1701,9 +1701,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_wid= get *w, =20 switch (event) { case SND_SOC_DAPM_POST_PMU: - mutex_lock(&wsa884x->sp_lock); - wsa884x->pa_on =3D true; - mutex_unlock(&wsa884x->sp_lock); + scoped_guard(mutex, &wsa884x->sp_lock) + wsa884x->pa_on =3D true; =20 wsa884x_spkr_post_pmu(component, wsa884x); =20 @@ -1717,9 +1716,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_wid= get *w, WSA884X_PDM_WD_CTL_PDM_WD_EN_MASK, 0x0); =20 - mutex_lock(&wsa884x->sp_lock); - wsa884x->pa_on =3D false; - mutex_unlock(&wsa884x->sp_lock); + scoped_guard(mutex, &wsa884x->sp_lock) + wsa884x->pa_on =3D false; break; } =20 --=20 2.43.0