From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 678D5480342 for ; Tue, 21 Jul 2026 10:28:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629693; cv=none; b=SVXb0wmPEIEJ+C1aCLo8fwlw0AEQjfAI9CzcT/EGdTnadi+oxIggoD5Q6ENn1Jzp5hT4+Arm5aXLgzTHM1SaOXjYviN7jOBOlIrPt4KxfHO7wz3hFzV/S8vrGiEUHfbM53DT9fwEHNeWid7uOWhQymmZUK6rxmu1Lx4tl/YrnHo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629693; c=relaxed/simple; bh=UCB77sVggJ4ivJJbdq1owmFYfz0+QciJpaUHkpwq9Tg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S8HY7hbyORUaxvifYap9S0xEh+4JlGfm8f6U+J76Nu+W4CCoVoyZgeCJfQWLcH44YZbAQL2VqCeettEanUFwYvuwFgpwyUPzrj5b1V4vezm1F1g9Sd8hgZUubLcJkkq7eKwJSpCIfCEE1HSpY/g3tRzMocaYgzvLVd2BSajm02A= 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=fn/ewOmO; arc=none smtp.client-ip=209.85.214.171 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="fn/ewOmO" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ced3386430so74010945ad.1 for ; Tue, 21 Jul 2026 03:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629692; x=1785234492; 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=pIe5hlvQfgQeGemklPcQXzjZsFGmFJ7H9Gsm+LXx4M4=; b=fn/ewOmOatiT5SUCGO7NOTc8eU6lUVXAyhHA0DYtvNtX9VpjR2khnHKgUt5ADxIyQh +43C7QQdz3If6GtQ0rMo8SNvROEIXHxCU6K8GtI/0Ooq2pfghsDHXMUeuZBEtxlC80Lj 2QXAgtpOLhI2b4Q7Qto5+2F0Q4tt14qoy1XtgaHvjnITBTdWdMTlZs1lzwCjKJY+YG1p WVnE5DSoFXKEsM7LrqDhgppLai29uZlduHyZQetTlPSP90s4UZR5v08kw11LcT0JDeth mzhCMQsIYqcOfpEcAoYOmF0FJr45VEt61+KZF58a1/O8qcu5s7nwBtfCTch8hurLeI+r gSeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629692; x=1785234492; 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=pIe5hlvQfgQeGemklPcQXzjZsFGmFJ7H9Gsm+LXx4M4=; b=Coax7q1zXKYshiqCPbdckV9df4dOBYdiIPlX8lQu78XFgPBJbChmmLhmefIZYUfLQ1 qsMkTxUt99U1aVHWjUReC7Pq62iLTLeoHQavX/u6Q+3WQOhXCQuiZKJoqWvhd+5vf+79 5EeZBercz+AMUlhTin4Mzf0BexqJ42AeDYpnTooYwCMDIE92lc9niwYqjfni4rhq+Do1 0s/N5yvzZt3nbYyT5Ox0rHCGYVXU23h9HXLPEYnSAT48RXGXRatx/bbuuKW3aSWoKB3R l5b1g2m6fiiVyp1zVZnp3Q+mEwON+Li0e5NoMGQVapyaSAdiy38uC5TGcpFqZZ/l9r8W s84w== X-Forwarded-Encrypted: i=1; AHgh+RoIehAReApH7xUUVlq6wHvhKHg83rjzxU976jlWZcGqLbGUp3W2Npq8ZbuRh4HbekwpTpXlchCApDj2JA==@vger.kernel.org X-Gm-Message-State: AOJu0YyvHihv1wRFC6nb0q/Sotx0C8UjRKWOz4eL5kNPITE1Va0fJxJU 8wqy9wGcUAKjbAJ3WFpM+1yOVi0mEz/nSzbY86/plx73f87xIJ2vPnVe X-Gm-Gg: AR+sD108u8TQGwn8j21/vXaLhSOYdkpeJKFB+09R34Yp6Hu8pf4qzlAJk/GeDXz27Hm AJaKOySI6yShHq81oPAQaxNHOf6bt/7Cmj/90NGScK84TH7eQEPDGgU7M20Vlj3yL7lpxoioUOI JfZzHhaF7bvNmT2mfd+3llef7zdOmphFIXtftGQAlKQWZp7TZ9Cta8XVx16c7XWeHfOl8s0MBY4 8GiFTfwt99oXHmBizcMmJDDFrfhKirqSf6P6cVfBbwPiKA07Z+vaX3V1nSvauP4mOjrhNAko3Od pP9kNsTdqv2K2MYZSn97uFbu41TJZqJABiGb0nU1MqvSuqwSTdrBGhdVYCkCKRdv+g3MFjZAXtL 1zZzf73lhrdFirNRm1/3ya5bMRUQzguaFU3zg9bixpkb+xTYiDMWZYDUehkrOMIM9jTJfs29qTw u1Yqpy9I0eeCvanyV+X8ur3WgWob7GulEIjIQ9 X-Received: by 2002:a17:902:e848:b0:2ce:fa3a:45f7 with SMTP id d9443c01a7336-2cf3485b0d8mr200674385ad.16.1784629691883; Tue, 21 Jul 2026 03:28:11 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:28:11 -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 v4 14/29] ASoC: codecs: pcm512x: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:45 +0700 Message-ID: <20260721102600.523199-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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 10868df3c75d..bf143e3fec54 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