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 26A32C43458 for ; Fri, 10 Jul 2026 05:07:13 +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=cKqRcXDTZ2AUkUtA/CqdSn+DCaTTyr1WUIIDbJXdQ3w=; b=fISgQhNUwzN9OM1Dlpvqv1ZWPb C0JGy2L/hAlHlTi7pQS/m8xrllK2pDA+S/myYS/I6IfYkX5kbXmyWcJVUpc7e89IzoQew4XI6xSQN a1jR6E6liNAAYnErV+KfPqTM8Aj7zeBA67WqxUtOVKx1FSPKX2euYB6Mh7aWM6E5xE5++tGupJdud y1kPcJ/EMeDEsNe34Mekyhoi1bw2FAuvHdruObEYDAce+/WFdbNWuJtl57Hk24lk3zSCTPXP9AeK0 ROF6hSt1lx025Ocu6AazIf0q+cvZywV/tr5jE0lak9X02gWH+7XY91X7B1IF8r6aJsWHMOL5d1KCB pAYexq3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi3SC-00000004911-1hYt; Fri, 10 Jul 2026 05:07:12 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi3S5-000000048uh-3D0F for linux-mediatek@lists.infradead.org; Fri, 10 Jul 2026 05:07:11 +0000 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-845b6d9bf39so529767b3a.1 for ; Thu, 09 Jul 2026 22:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783660025; x=1784264825; 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=cKqRcXDTZ2AUkUtA/CqdSn+DCaTTyr1WUIIDbJXdQ3w=; b=XFsZGL5otl/cyicYrvaPX0COO+3AQdKli5X5ZuTia725I6sI7tLPs0s6ojUH2Wg2qS 0NsJXxPGwbrltpi5aEJeCo4l0DH2kt/IJvq8fEPwuwmbEZtus4e53CRMXkvBl+PGikgR 95JPOwKvo3lHhoCRLDU8RhyznFznKvIQaNOYPwLy/CzF0ap9Ea60AFWxm4kCpRV9UFJg xZFH5CE2FPxT52RxPJgNb70VfRzP1fnC2D8ZxOaHJvxp+u5bLBeH4n1s3MskzLgIe3z7 ZCjB8Y25ahsWEYppQws2VGss9sD1cHHX+hoZckZbQQ0L/Yl1Bl6G+p+s8dbKcbiIbq4q vSgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783660025; x=1784264825; 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=cKqRcXDTZ2AUkUtA/CqdSn+DCaTTyr1WUIIDbJXdQ3w=; b=JJZOXMWO5RH4S4Ze8EZ1iZvyER56TRRoLVaKNC5kTLo+AO8UBWHIrMzdr+029CpPbY WQBHtkEgUCtg2IgMoX6o6IZiBfMjzD93RJ/2WLEQtyh9P/xzhbbWIPD83tRRIR8G3Mz7 gzoSRRfNCBvQnqI/CbiRWlmXvMXjMF6QcIVbhkoeXngYi1wQgUlD1jXqQP6UHVZ6kzWN q7sL16ZNNzjfW5U1bbD6X4dNNo0MdxA+sqCIMNtTWHpxCI3TdAs3jsJbuMIbrR/rkf0B w5GpIHPp+MaGlqAyY8K3bcthC+4Q+7JLGxr7xLdIEenWNF/SkE076ZhYcNSsNdv+6DfE qxpA== X-Forwarded-Encrypted: i=1; AHgh+RoMOr9iieQNwmJuNSJZa51YuLC2+knVritIpmtEC/FjOoZmkqZEXAp0qtS/W7dyjFHp8RI/nPuiXQlBmG3kZg==@lists.infradead.org X-Gm-Message-State: AOJu0Yy/U6J5CwQxBPIzsEtS9nyLGOjSr40eMf1iPMv8FltXi73ww5LJ 6KjKbFOy655JbFUfOOhIGfHWjHUwPPiSIcvEIikBHrZjaE/r2z55Lp5A X-Gm-Gg: AfdE7cnkYtajgS0tD9SZ+L3qXOW2WCePT2n/lZelZINNUR9cIvkf/4a/1v5SGKX0cDw jPT9K49ee0oo/0UMdZ6KrUHcelmQarpjnvJBYitlCBs8dmhkXd2+bBcrwcpxNtD26Vnp7aYKCLG NDKqxtxeE3npvGTuPw4KIxL1Y53yu+HjZo8VTw5krdz+vx05oHVG6O07pJBq1wS/N2tnKWUG4CR bkCZ24Et5x/WxyWFQ82gDxyuDIyMdjAemnGuOZq2zF0gAimDL17lEFY9RyYaM/Wm2HHxxMH0CfX tPEzM5JrkqEfng6sP+DxbTbv++Mhdm55VVNALV9YpeA0707K4Cgmg/Z6kkizGjDx/sDntCrjuV8 hSs8IK0HGLvDphwdMe+IZ5CJ3QuH43UOWynO7RGWIO1eIIBS4wzg8w0RXH9072h/WW8ID9TXsQd C5/ZDL8AUDMk8Xh7ey9GWbkGgez0zpa6ZZL51KsTKnfQyaDa8= X-Received: by 2002:a05:6a00:b45:b0:847:b45b:fef3 with SMTP id d2e1a72fcca58-84870b7040cmr1847885b3a.27.1783660024823; Thu, 09 Jul 2026 22:07:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84847275fa0sm3400499b3a.22.2026.07.09.22.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 22:07:04 -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 v3 14/27] ASoC: codecs: pcm512x: Use guard() for mutex locks Date: Fri, 10 Jul 2026 12:04:58 +0700 Message-ID: <20260710050511.14439-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710050511.14439-1-phucduc.bui@gmail.com> References: <20260709045902.498848-1-phucduc.bui@gmail.com> <20260710050511.14439-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-20260709_220705_800646_707DB9ED X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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 fe3b5011fa16..88e235de1107 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