From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.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 71E653D7D80 for ; Tue, 30 Jun 2026 06:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801437; cv=none; b=Uh1EpWDqIX54IE2/uwAsPVe2ZHw6uNT5ERS1qkMesIsmhGNHDconb/vME8Z1p0juTkEBd+PTjxOp7t/tDFWbNg0Nk06Q8yba48iuNjxg8MI48g2kjspM4CsnW1UKVVfpQj16c9zGrRB+fmZq2X7RKZ70SKhIhmHteVnPouv2Axs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801437; c=relaxed/simple; bh=irEDa3n0ohK3TQxzcb1dCcz25OmFm3UBow1veHYd1Gc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pksn349kdK+KUY/6hVJBtmFhQ18TqyX9IQqxAlg4CkySCdlpxxx90RWVx5WA74Hj7YS6wbVmBuVgaGo/QIWtXI/mb7eC1XgNnoGiDk0Hh0JnkYCLrOuXBdberYz316oTlyE27suAoXHXbqpUaPsN2/ueCyTYCZHqrjQT6w4C/ps= 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=lA6fCbos; arc=none smtp.client-ip=209.85.215.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="lA6fCbos" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c966b9ee9cbso930622a12.1 for ; Mon, 29 Jun 2026 23:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801433; x=1783406233; 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; bh=tdURt4n+DcvB8vUuDlvqMqiJ0G2B0zktNvndjJF0Ruw=; b=lA6fCbosrWOssoj5CvhuuuF2exAuxVszyJHaFfxM4Z4kWBQimdvpEqOpGAeYLdZ3sR OpXPdW/I8xDeHsbshNXoWUKKHMGvwv3b20enP7jqeDbgQp7sNJ3ke0q1711IuHLReExO 0DNQdfFN+TFCo0FxIyRmycN9c0LsBPl0RSlZaP17i5VMUNsekcK9yzk91zhoYopf5AX/ 8pRKvtvM9u7lWgYBTUHIenF66ZSnyhcqBrP3dad4c1W/TB/76b1pqe02pYhl5pzQ5W7w 083yRs34/e+tslOvsGe9oU2Ux1mZZEAWmZvZHFgMqsUyhMcuZhy3aXwbbq/6hr4W3bXn wVBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801433; x=1783406233; 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=tdURt4n+DcvB8vUuDlvqMqiJ0G2B0zktNvndjJF0Ruw=; b=AySjLxHepG7wGKYNajW9wYib+PpCVmEz1j+d5DtskWDuEKuHEaoh+dHF1C616WNj7X V72lSgAqyFKz503EwvLAeqAT8bcK6AFs1Prjp4UKKD+or7g0HiB+tDmVs1igEgo943F1 WWCkGGaSnUWkwIp/hAr9Ybt43Xcw42Oy4tfryqtcsnUMmhxDb9UObUDp97N17YMpY/WQ E0Tq1e4fQWSoJSK23NBQmhHzAnFbOrqlv+1UIBh4ChqIuzUOdiAA7K6kPCXlBI0lN+FH na//m7bXG7E9xoI/ybHrYggEEZgNlul/xydTCO1hOZTJhS2tWSVDzAvDpLYdsvbh9Rtv EXaA== X-Forwarded-Encrypted: i=1; AHgh+RrovwaJy0xfSAEOONQd24EsjO01LulBfa3U0JdU824W2nlGlg9jpliVWq/ClYNPWfopjkvtxVTHADOdAw4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy//BnIN7+FdLTHKml8aBuBRivkVmrBKvePkkOsQtykK7wmfiCO 3q6ZOpMG62L/S7D4TVMrtJ/UpVPAkDE0y6U8dfiyNvEqhizNKrGpCK9f X-Gm-Gg: AfdE7cliH9ah3Kfwinih/HX9gdQvtXFFG4ayrOPjhltQ/HamOXMCLVYbLuVCZ7ykOGF e/iWcvrCOJjYPECU8JMV7zXrMEP+uQ3rMv/ukFbjP7qcp7y8IXeNQ9vVpTgvAYPX/cW7ulNMVx1 kBzX0uzSLRuwhKMKM6OTrjZKj90T1jReNk1WaAcINRm2Ni8FRbAhDC0hOTMLb4heu3MJEVhZ5Ol ATiUqIPQ8R8u0dCDJJ1Cem5/7JCN7Dhs87bM/hVy17fKzMzyF4Wrbe/xCHYetBWJ72zx1Nybynk P0srWlaWA0WSwTEJH3LevAk/qhAHbwLsbUl61/eZQKtDCtOGOzReONBzJ7JF6fjYiTt6acseQzy p2GjPyZYOW2iBB1tP/zJFDBlwXhO4uI1UJntdiqX3Oj9PiS0T5GZ98e7tI0W7j/T+TCRiU1CPNt cv3Tdv13PjeppFQkaBvfCniBqHQqkbBOi+9WhWVqtevnOR71OfuV3r4jCySA== X-Received: by 2002:a05:6a00:3e12:b0:845:e9ff:5d97 with SMTP id d2e1a72fcca58-8479f105f11mr1877705b3a.12.1782801433517; Mon, 29 Jun 2026 23:37:13 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:37:13 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH 14/27] ASoC: codecs: pcm512x: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:36 +0700 Message-ID: <20260630063449.503996-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/pcm512x.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index fdef98ce52f1..bc777a53dff3 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -6,7 +6,7 @@ * Copyright 2014 Linaro Ltd */ - +#include #include #include #include @@ -399,10 +399,9 @@ static int pcm512x_digital_playback_switch_get(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component); - mutex_lock(&pcm512x->mutex); + guard(mutex)(&pcm512x->mutex); ucontrol->value.integer.value[0] = !(pcm512x->mute & 0x4); ucontrol->value.integer.value[1] = !(pcm512x->mute & 0x2); - mutex_unlock(&pcm512x->mutex); return 0; } @@ -414,7 +413,7 @@ static int pcm512x_digital_playback_switch_put(struct snd_kcontrol *kcontrol, struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component); int ret, changed = 0; - mutex_lock(&pcm512x->mutex); + guard(mutex)(&pcm512x->mutex); if ((pcm512x->mute & 0x4) == (ucontrol->value.integer.value[0] << 2)) { pcm512x->mute ^= 0x4; @@ -430,13 +429,10 @@ static int pcm512x_digital_playback_switch_put(struct snd_kcontrol *kcontrol, if (ret != 0) { dev_err(component->dev, "Failed to update digital mute: %d\n", ret); - mutex_unlock(&pcm512x->mutex); return ret; } } - mutex_unlock(&pcm512x->mutex); - return changed; } @@ -1465,7 +1461,7 @@ static int pcm512x_mute(struct snd_soc_dai *dai, int mute, int direction) int ret; unsigned int mute_det; - mutex_lock(&pcm512x->mutex); + guard(mutex)(&pcm512x->mutex); if (mute) { pcm512x->mute |= 0x1; @@ -1475,7 +1471,7 @@ static int pcm512x_mute(struct snd_soc_dai *dai, int mute, int direction) if (ret != 0) { dev_err(component->dev, "Failed to set digital mute: %d\n", ret); - goto unlock; + return ret; } regmap_read_poll_timeout(pcm512x->regmap, @@ -1488,7 +1484,7 @@ static int pcm512x_mute(struct snd_soc_dai *dai, int mute, int direction) if (ret != 0) { dev_err(component->dev, "Failed to update digital mute: %d\n", ret); - goto unlock; + return ret; } regmap_read_poll_timeout(pcm512x->regmap, @@ -1499,9 +1495,6 @@ static int pcm512x_mute(struct snd_soc_dai *dai, int mute, int direction) 200, 10000); } -unlock: - mutex_unlock(&pcm512x->mutex); - return ret; } -- 2.43.0