From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72E0BC44529 for ; Tue, 21 Jul 2026 10:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pIe5hlvQfgQeGemklPcQXzjZsFGmFJ7H9Gsm+LXx4M4=; b=4Trf8BnosMI13GN2EtMoC6dEvy DojoKwgLhsGgn+VGJ3Y9sj7goUl4g4jE2xfsauBJmhoEO7Wu/8Rzz4CrXdRSJE0zFDT2jY1vN1st4 NVTV3PGlmQp3gPOeEd+wfqBw5z8UpGZj6MPOHhew+TsZ4nB8oPMpKt5KyF5qCZgRrDpLB4btbjtK0 M1j4WPASd6zYYRDrZ/6OUkx82ZuHqPb3y9+GR9DhSgZO89u08jNjAeznbEoWxz/lnJvaqPot09WSg Zzfx1+OIggwATq/jBqna2bAjidkq3TvoP5TwtDXFjCkIFFoApesoIOE5yv5v3SC39P/khQb51QURH GPyNnFsA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7i4-000000099eF-0eKk; Tue, 21 Jul 2026 10:28:24 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7hs-000000099Qn-2Q7k for linux-arm-kernel@lists.infradead.org; Tue, 21 Jul 2026 10:28:14 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2cf6d65d8a7so24131105ad.0 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=lists.infradead.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=hbVfJLN4hFqnKd/l3VKLJp54k0jQXRf96Z57qCDQB7U1rtE1+b/R6NO9ADWJ2Ti5zA oJTmCtWbxWtOwa/4z9u14OtIWn2gdRN6Ss41lA1YKIyEhbsaUUJSTflE4wPkYImiVdf1 XMyiAts5XDe6GtqVAYrRm+yCq6Ts0B6jlZHds30W0F781xBoK8PuVuRBHtsB5ftFlYHD IAs94p3/nhm2/Nd4SmonDzkQUunkNbNEyzZIGcSJHD4+9QMDuj6Qo8Tt5p7u3qsjOg9m KI67n/Gys4AdKihTe8ic1uRjokTI9+0IN0b2XIkMpnshj+M0Qj0Mm8mHcz23ZQ+hkL+2 jqzQ== 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=Nnvj3OQD41rT+fX2c+1M/yvZo6iBNgIJ1oAPOPiEv4oId3Bz8fMLGaxmb6hNEhnlB+ LjEISQgUINqGWRoNGRLLidb+VZojWLIpkxvlpLhXUwQj1+soWOa5sA9rjQXjBLXt5Vxh wwVnRHq+6ErUwuLZo5N6+rlE+E2O5PAJmsIsH3dqrUxKK+3erFNjnNzuzl5YFAqh1Rjw pmVtW8nJLIVRoUAMp9mruZ3mzU+N0bTwpz/6k/u5gKecKX0CCO0+eZrcivo8LzaF7WWp BwDhSmpYYplpPTaTyGLKn8oa96L7xZSF++urehXvXf+o7h9aEGtrg33p5kROd7wj2LuO OXJg== X-Forwarded-Encrypted: i=1; AHgh+RqjZmFm0/2y9xHNwt8XSigwiMi7GHVg2LhFTtmqdXBIz+Ht32l0oTO7Sz5zLei5UKjP0Fzs0W460wtvVCqqkk6W@lists.infradead.org X-Gm-Message-State: AOJu0YzVrV3FkBkYqy+H7rr642+y4QPLTZKyN5zVrP72sxZCAo/t/mOH XdrCIotOUjPffPavEKzZEmFIa9f11pkKLeQn42dNKn18Wt0atx84lAXZ X-Gm-Gg: AR+sD12mnt6WZgMsRGQ+9ZDbe886SVd89OtDt6F6sO3oOysdGmfz92yu6B0PmSXeV/b q7mZ9HAY5L+t+855xyK49G//RMWVjG2UeTwFT5mQuJ3zQtK9xKEzHmgLwBfezle7GeYGgi0OIxw egcbzUpi4thF/TIGIWqEOEMLinAxfu/YeG6RWNNPIJIhICfTOaKNk5v0C/FoqpNL72FUdDRfc57 xNuHsko8Yo/4FUb8ZoIIiumpJcykk737BYMTonHgaXcokL97sak7ZMxcrFYWkqTHk3+bOoGGaph gBjq1+pb8MiMlr/H9o6HakwiO5MmW/fmJxwae7Z0CvLqN2k9L2TB9lJwXKoMrzbpSVIWtHCliOu tUuXArCM311hGgFjSRlnAY0oiHPZ8+I9jwiCCq8xi47RYG6odbsQ+fXwOI6RJ2gSnLnbE0zsXuu Coe5GXqK2vlRXoo1UAdaibTEWvAP+ezgCKZrVZ 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260721_032812_675820_ED5A75A1 X-CRM114-Status: GOOD ( 13.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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