From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f49.google.com (mail-dl1-f49.google.com [74.125.82.49]) (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 D725B478E53 for ; Wed, 17 Jun 2026 10:41:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692892; cv=none; b=jBrF7PlLF3UmFkoIx5RESHm8Nf9mptJCQeoR9AR2EGA6yrmI0xWqXI8bzymVG4nD+R3e8l8aBz1/GkygsYzk+UUxfz866ePnYU4N9y0EloPCaS8vhGRIVHlZZRwV/egNXF5wQMME8XzH+dSxid9dvJPn7QSdYK4Sv6fpRx0vjhI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781692892; c=relaxed/simple; bh=CUFDizm8j2l+aG+O0iqDVpukA4UDOPYwQgm/2dCZpzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gMFY2Vpu7WqI6C7iIWSTG3+zgD/cDVnX1HlYwGpH7aecy9EaY1rX7ZtEwrWwA88UtlN+nihWzGE7kjwceHpwcycxFqlNDAEWknqV6FetuPeExrjrZx/IQvIqtYUdMCO6gJi7RrWDW9iTGqZRz14722MNFs9zBw5A5G9tIvDba2Y= 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=L8ib3GYj; arc=none smtp.client-ip=74.125.82.49 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="L8ib3GYj" Received: by mail-dl1-f49.google.com with SMTP id a92af1059eb24-137335bc3caso6891545c88.0 for ; Wed, 17 Jun 2026 03:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692890; x=1782297690; darn=lists.linux.dev; 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; bh=AUF1nUSK8JjVFEerCymxn+O2TFW28hvbz/kOFuEnXM4=; b=L8ib3GYj4exzevc1NuuL9sWoYTn1RG3o65+19TGsr8f7RYmIT64WWTSl/ixAUuMOxb +xAbehCmjOXOSjgJA6dU3DqLphXzwJXSXyooFX6jiO2N6IXiCWmXiIwpQQ3tIHBTxys/ /PZ+ap5/KmIpDmkAQH3KnnKK8/xg7lMvxsTbAZSAjIAQFIz+ByMB1Q0BhcXq3pxTePjE ZQBomqGEgG+IywavTrAXSA44u5R8yAY+UYHIldwJWF3Khc5rKFpTCJf7vtQt2LdSdanz 2N4AP354rHQR0qgplTSNsP/VLdi29Sy7dyzUbiPE2n8N+i/23W+0F0OXAISUK/AknM+c /EPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692890; x=1782297690; 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; bh=AUF1nUSK8JjVFEerCymxn+O2TFW28hvbz/kOFuEnXM4=; b=X7Y67c+3X86Z+BamTrh9XqZeqDXVJS1Dgece04lkz+uPpi29VawqV0XXd86kItSQqH Q53RUNbOAcGs6RwNptC0eqPKCX/QrW1tu35y5FQeAg8JD9+g2pNcG/mRR9zMw7D9obXH fShMrnd1YoKOJgNq59jd8GsQhBvtTkv1y92LTxV3sJwugyunXm9v5SifjrXIutTlyEO4 i01zuop3YnykHYqMg9EGxGiKZ1NVzkmDlgXRuLXKD4zUOALRBX54CySu/B/0znBZL65B +uF0AyyVwY4h7D6zq4mycOcCUQcig4yc8t9jmZnK3EtsvqA73DsodDhsB5slnWgorMxO J2ng== X-Forwarded-Encrypted: i=1; AFNElJ/XsKrle0BvsYtJ51L4ownAE+og+/B0jrM+zKvgyWOwdu2rTG/KYO7k/76zO/cxRnk+1eLvEQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yx/3kBkkGK8zM6Z5zsYQwh1gEjiBb6bEwHSG6t0dPv3h26Qy66J HUWrVtipaTLFAqZBE1kppmMKEwvzeS0/b1EgUPh1RUR451zhGA+OVPpn X-Gm-Gg: Acq92OHHVsWwQnkOS2YEJ1xN3Wijyqjzckjtoj2GJQFSqsm48mQEmY9h5JXebyYQKa9 9RZXTTzUHQcIDHtxs9IdvLKai+Nz4XDES5WdLZh8RQymV7hGpG9iUlYBknXy6ViVw5AKr6oVm+4 uHjU0qL3mJpBClV4VSy+OR0Ds99Ck+rKhn8C1ybZZV/e/vMN6PmhGXfvmkWiV7dGwCkNC10tk6P JsaS3q3td/hunrxahUNNWyfMw7Ib6T2OuAWVHqPXWrvyHNtsl0fUG6AATitNBCcqGB/lG3c+BdC 5PLrzhw3GJ9ey0T8SRImtgND7Occ9zUPJXAguvzbBOWGllfjBHxYf+OWnSj4g99BQORcvfp8UNA 4wMUhP6VPrJWIaa4RSOLBB8mowCN7rBRp1OEn+fXeVrvzV9VF/3yvvnQXmIdLnecaE1wXCSdngw Rf3l8ePymK7nbHH2dgPDnehgjZ0MPAQ7Hv3xRcvHx0lU8QuqeDTpEkwfbetw== X-Received: by 2002:a05:7022:112:b0:137:edc4:a5e6 with SMTP id a92af1059eb24-1398f6b4762mr1323943c88.29.1781692889954; Wed, 17 Jun 2026 03:41:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:41:29 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 55/78] ASoC: codecs: tas2781: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:32:12 +0700 Message-ID: <20260617103235.449609-56-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: asahi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/tas2781-comlib-i2c.c | 4 +--- sound/soc/codecs/tas2781-i2c.c | 20 ++++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sound/soc/codecs/tas2781-comlib-i2c.c b/sound/soc/codecs/tas2781-comlib-i2c.c index e24d56a14cfd..85fcb33752a1 100644 --- a/sound/soc/codecs/tas2781-comlib-i2c.c +++ b/sound/soc/codecs/tas2781-comlib-i2c.c @@ -342,7 +342,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); if (tas_priv->name_prefix) scnprintf(tas_priv->rca_binaryname, 64, "%s-%sRCA%d.bin", @@ -360,8 +360,6 @@ int tascodec_init(struct tasdevice_priv *tas_priv, void *codec, dev_err(tas_priv->dev, "request_firmware_nowait err:0x%08x\n", ret); - /* 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..f2b739780f73 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -843,12 +843,12 @@ static int tasdevice_digital_gain_get( unsigned char data[4]; int ret; - mutex_lock(&tas_dev->codec_lock); + guard(mutex)(&tas_dev->codec_lock); /* Read the primary device */ ret = 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; } target = get_unaligned_be32(&data[0]); @@ -868,8 +868,7 @@ static int tasdevice_digital_gain_get( /* find out the member same as or closer to the current volume */ ucontrol->value.integer.value[0] = abs(target - ar_l) <= abs(target - ar_r) ? l : r; -out: - mutex_unlock(&tas_dev->codec_lock); + return 0; } @@ -889,13 +888,13 @@ static int tasdevice_digital_gain_put( unsigned char data[4]; vol = clamp(vol, 0, max); - mutex_lock(&tas_dev->codec_lock); + guard(mutex)(&tas_dev->codec_lock); /* Read the primary device */ ret = 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 = -1; - goto out; + return rc; } volrd = get_unaligned_be32(&data[0]); @@ -903,7 +902,7 @@ static int tasdevice_digital_gain_put( if (volrd == volwr) { rc = 0; - goto out; + return rc; } for (i = 0; i < tas_dev->ndev; i++) { @@ -919,8 +918,7 @@ static int tasdevice_digital_gain_put( if (status) rc = -1; -out: - mutex_unlock(&tas_dev->codec_lock); + return rc; } @@ -1766,12 +1764,10 @@ static int tasdevice_dapm_event(struct snd_soc_dapm_widget *w, int state = 0; /* Codec Lock Hold */ - mutex_lock(&tas_priv->codec_lock); + guard(mutex)(&tas_priv->codec_lock); if (event == SND_SOC_DAPM_PRE_PMD) state = 1; tasdevice_tuning_switch(tas_priv, state); - /* Codec Lock Release*/ - mutex_unlock(&tas_priv->codec_lock); return 0; } -- 2.43.0