From mboxrd@z Thu Jan 1 00:00:00 1970 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 DA39B343D8A for ; Fri, 31 Jul 2026 03:10:21 +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=1785467423; cv=none; b=ugXPAPFAkVmflvWCg9vdBE62VEHA4BOnZATxzakCcRMadLWPNNDSuB6pQkSMWEwQsvn/XP4eCJHyerNRJUtcr+Zqwe8JP+My+OuoAVj5rJRB8iQ5/DUBVX4LvG4jGnzoSQhSwC+PUwRDX+LbSZUj1AQTsVaCS8lcVtJWAkTEsXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467423; c=relaxed/simple; bh=uAVGrrdJJEkwGPUs8mrqYBmDa0hb+jLcInrWOC6p3cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ny5XCr+9s0KvLweKF2fQoWsIJJe4dNDXAbWRIVvgMDCvn0fcYf+XOUx1GUIUMNRFRHdGFYNc0cP1pQXdcYh9xF2pADgXbWsYE+y7ve98QZxbPvmopJuy8IXId7h1JauuX7V4KLJVd3HfpXPU0C33okp+KN/YzG5ZgXoO3pflUVg= 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=QepmZfPN; 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="QepmZfPN" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ced3386430so4618265ad.1 for ; Thu, 30 Jul 2026 20:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467421; x=1786072221; 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=GBTpcu0Fe5PsDRigZ5iomgO9tYMapqnlBqmRFhSq3F4=; b=QepmZfPNh/XIXd4WiuhjtCFyFfl7BmHtzfyJcCP24Dygwq+aOQSD+1QpwhsroLLNPF g+LmAWRBdxmUWNQrY0i3wpG/H9A1ZKxdaoGxNxee4wxsBJ4CNppBCy4Vz9GgZDKa++2n eZ8MRP0vQVGYZmXO5TAlRoYEwO1rRJP4VjStQxOUo5IMTn8kd37aJH/kV/GX2DT/PFlb TkN8rrziGCLlnFxk0I50vFslHu4oemSlRG28Gj+4jANtNQJzD1YqW3zHLXQItgBjYae3 Wod4DhG8MwEacD1FD59vWv6HSNl957vsPbV1eA9tmuZTwhHgzpUHuG8wxHrt0DZNR6Ev g1WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467421; x=1786072221; 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=GBTpcu0Fe5PsDRigZ5iomgO9tYMapqnlBqmRFhSq3F4=; b=dHQ9TKE/f/Y/3W6GbtmFABIqKpIlBaO3bUBM1BAXYo1S4+nHAFWimZ1h+af5NEIzri XPfHSSRhX8k2t51uaUVjhWjIJ71ntzcQkzyGnKIA5VLHQ9uRGKzFEbFmL+kJ2565Ld6+ ewRM8luGskrVrpvC2D1Jfm3HUGhNtM5C/z37A3mJ8uOjFDYvA+EhQkiFSlknO7aN8wat 2RfA0fswe85yYu12pNMYp26ZjcT1NbIBaRTg/sx3XUqEfJUIBnXm+bzs4l6iPsPy0z8w 4iZ09Ixo/k9fWSdscWGckUxn3ixX0gE7iUQ7f89g5gjUqfdgBMUPLKMpAzOx3y/GlOui H39A== X-Forwarded-Encrypted: i=1; AHgh+Rp/JBYj1rlZdRA8o5PBQ0GdyIxFnblozp5xtBat0Zc1AmPeE6KzCw+9e0D/6UVNnlRx5I8VRCn3olsh3qQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5kUdEFmiPubtNBfb5D5GSWTMHW1Rf0JpBnP51e/dH61E/ok8O 0yGXY9e4F3IR60HCaTsvQK7cpm49uwOxzdVx2WgxgfL2lQ5UOX9OKHjK X-Gm-Gg: AR+sD13Vzy8khtQYVAp32gKeCK9MvtIFOar2/r2SZyY/vwrz06pjbEhF4OFncjlrIx+ oDEftxSxZlJghi+oZ9f5/RN/3zTVQkKztJdnTHvOP0pOL0TUGbPEPwU0ghCXP+G25y0snPSW5Mp 3zvl6hkaTqhT2+aBjyKZQIBZPQ6A2EN5t0mlc3uZvT3vBN5c08BY9sLThIVTLCDpuJyXQlii5SB ZIglFg4MVMwIcvWgAOaB64+/5m2hxOlyLKzcupW9QOY70UQmNU63lD2A3gRIsK6KQ/XDsz0zeMv 4DqaG7Kti0Y+6j70R0RX1GwbJ06k2UEpxGSR1HBDaZ0BNrbUBBIyNdxo+y5b8y3IEzvXD0CtpfS ZsfVllufY2/s+B3L86Vl5RYuC6RAc9JWi2hqbS9p5OiB9QwETl7O6xYd6hGiliYWpHkeIKZ5iTW WxDa0kMAZ/5ggSM5iHqWyWEvY5o6hY6eB2ZUeNMVqi6J1C7BJjKPRU9zqUY+/7rEitsNFeQVQAp ZESMISV354cSf5Vp1LFSK8WPxNj82teQ8s39GKBf8e3AtANixaeUw6Sk8ACX/i0wBr71y8DDBSq 34CE X-Received: by 2002:a17:903:26c7:b0:2c9:e961:d256 with SMTP id d9443c01a7336-2d046eb4dffmr4931695ad.27.1785467421196; Thu, 30 Jul 2026 20:10:21 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:10:20 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu , Cezary Rojewski , Richard Fitzgerald Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH v3 04/26] ASoC: codecs: tas2781: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:26 +0700 Message-ID: <20260731030648.8706-5-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731030648.8706-1-phucduc.bui@gmail.com> References: <20260731030648.8706-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- Changes in v3: - Remove redundant comments per Cezary Rojewski's review. sound/soc/codecs/tas2781-comlib-i2c.c | 5 ++-- sound/soc/codecs/tas2781-i2c.c | 33 +++++++++++---------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/tas2781-comlib-i2c.c b/sound/soc/codecs/tas2781-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 +#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); 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); - /* 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..4d5abe01cb22 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -13,6 +13,7 @@ // Author: Kevin Lu // +#include #include #include #include @@ -843,12 +844,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 +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] = abs(target - ar_l) <= abs(target - ar_r) ? l : r; -out: - mutex_unlock(&tas_dev->codec_lock); + return 0; } @@ -882,29 +882,26 @@ static int tasdevice_digital_gain_put( struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol); struct tasdevice_priv *tas_dev = snd_soc_component_get_drvdata(codec); int vol = ucontrol->value.integer.value[0]; - int status = 0, max = mc->max, rc = 1; + int status = 0, max = mc->max; int i, ret; unsigned int reg = mc->reg; unsigned int volrd, volwr; 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 -1; } volrd = get_unaligned_be32(&data[0]); volwr = get_unaligned_be32(tas_dev->dvc_tlv_table[vol]); - if (volrd == volwr) { - rc = 0; - goto out; - } + if (volrd == volwr) + return 0; for (i = 0; i < tas_dev->ndev; i++) { ret = tasdevice_dev_bulk_write(tas_dev, i, reg, @@ -918,10 +915,9 @@ static int tasdevice_digital_gain_put( } if (status) - rc = -1; -out: - mutex_unlock(&tas_dev->codec_lock); - return rc; + return -1; + + return 1; } static const struct snd_kcontrol_new tasdevice_cali_controls[] = { @@ -1765,13 +1761,10 @@ static int tasdevice_dapm_event(struct snd_soc_dapm_widget *w, struct tasdevice_priv *tas_priv = snd_soc_component_get_drvdata(codec); 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