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 44C12C43458 for ; Tue, 30 Jun 2026 06:37:36 +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=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=tY1mphzrP4CQNEWX7j8ZP4Wx03 8tnEInqffcmdcuRpyQmD2I9AalEI4X+ygwMzdMOMpA2/Cx87KUKlmJcdIid6+mdDQDV3im8sqN6hz VSeSjbktdnFDnTfda4MoZUQmpv7IMVRXFTQIodisMdCmRfJFqKZBJj5m7Iklztvh2MnibJ0rCVwIM fEAP++/fJ6JK3EpY6FjlR3JWTNTcAqbQJZGFVG8lQypn//kqtg5lBlyeArqsf6EJBNtzxqwR4SxvR KPo5ItpHYzkVZmqCAcprk4MqbjwGfVMv/Y39yScGqS/uAUlU9c+DMsQV4gsPjfViLL7Me6txGnfYi b2tF36hw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS65-0000000FzPr-3koL; Tue, 30 Jun 2026 06:37:29 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1weS64-0000000FzNw-4AJv for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Jun 2026 06:37:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=F0ksodKmDMiQ+RsC5oBMNIJum8 +Yjftr3NI/b4v+7lqckakFzKA8BuFg4kKp1epqbVpD8kYQMolSnInmwBlv03g5dHsEoiJVB83Xy9J Kl1R4KwE90+qZUfe62TORQXS6HrehLHpzQduM81jc3+sO8eAc7RVFaJoxrGgbsmtnfwP6amGKtwcE iFYY88vT+9lpp2jSKSxVvL3LIznVTPfYeYJy2NUo0S+7WlkFEBvC3ncIWh/fSbWFmdO4RO6SQeCtZ kqr93H9xX1ResLI0S0uMmBsRVIrjRjfl8TkVMV89RHO07h+czeyH83LMxG+r/ko9mHBe2hR+mvDW3 jabW+1KA==; Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1weS5z-00000001ZMH-0cO2 for linux-arm-kernel@lists.infradead.org; Tue, 30 Jun 2026 06:37:27 +0000 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-8479f1a86ecso351824b3a.1 for ; Mon, 29 Jun 2026 23:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801441; x=1783406241; 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; bh=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=esI6QWBUUn+DzUBsxl20RnuLoMjhD5kbQOKJBPqwuGHlD+a6dvCL4sEJp7cyAqe8lD EtAKMCpGHDttI66ZHbHSQKFjMSy2tiaYqQ91WZ6DrNpNZl7uy2YBhCwjs8ew35vrTWZp MjlcNrZG/lFxYp09P07RqdM0C1KXnPiM70EAhatWG5DNJIYLJr5me9wBPXsE+2i/Yxgn qSqKKMCe9DQZlbV+dg90lS8QP/XG2V+fJiFMwIBKLp8otEEL40NRMGDzbN8D048Uf009 Jow4Dw0MeAQpmThF3UGmIbSSRNg7yBmtAQl6NjAbJLXpQPxkhv32H3Ai1dd45+mv9fWB lxIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801441; x=1783406241; 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=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=mdevDwuortP03T08Glqnjga6ub5Jb0eh/Y7bK9JZp07f8R4v1sfZUhJnvzw8cjkrpN taPNA2aOduAa9q6yWd/6hbq6J7hjzYFtG6xKfY/KNZ1V8C+G/bPaKfNScxv1wWeE4ESA VAKxHpLiELZtQ4QC1T3SrFxklL4E+u1GUX6z0vC0nrIBvrwPoIf1h3lDcYJmk1lE7M5Q CbV8J4+YrwEkLKaLxB1dv10VfkoQD5FcBONz5k5s4n5XosOJkXfsGS3oGHecu1p6Nnn5 qmsL1C6pJGlr68a4Uz9WvKAgNiN0BxLs+nHTZp/uJYRVfjOHL1HNHzCpWvVks7IPLQxx QnCg== X-Forwarded-Encrypted: i=1; AHgh+RruvPkrQUoib2/5mOHOLkfW8bwXOxRbox+eBDLcpG4mFeojv2Zz2zLUxs3x2u/S+pEK8V1pYS/h8i/PXtCiuvFg@lists.infradead.org X-Gm-Message-State: AOJu0YwmgDioASx5NMcymjE4iAo2J8D7b0IP+PRF6bGA008FxoSsu4kV hrA3fcllJz4H5SJW8XlAn2+CqneiO+Yc0EHr5RaeMlVyXxiQbrUjBvyU X-Gm-Gg: AfdE7clgKD5IC8+h6Ih7O3aSN1+0ianGkTEI2i0RsqnNSGnx9rtEayfGNjnlVvnXkt+ +xwHYISq1UINFeNsobfZKrLurjKGcOorVQqgWlscv+9EG6hnwhRUHW5ZYP/clpJFiOs46wWqN5A MKqDmR5fGWv7zu3a2c/pREv53eSy17A5TlTUeHLsD/BP5VEGMPt49R11+aBWBpG+Fijlj4/NJkF qraZs09qXtW5+q13lyzU2XvQSnglQWTBb51lLsuURchwxT7dIDp6XyQujAeVFpwYx4EBRL2MAaF PXDAw/S98udJrEXt9beQetM2rH3CbpZe4IfghAzgXV3zddanzoM8ANZVS2zQDVF3FKWopIFwU7e m60s4KTCSgO1X6fLyoxsUe0kbB0c3hrZAR94WTmNnT7uDMXHgNAuI30bdRHmGp5xBdD3zZ8gbh2 OfbHGPyPdNoksWkY2cY8LXhuYBe0NbrdXGJ550QphX+9N8bW0= X-Received: by 2002:a05:6a00:6c8a:b0:845:e7ee:eae7 with SMTP id d2e1a72fcca58-8479ee9adb3mr1788259b3a.5.1782801441327; Mon, 29 Jun 2026 23:37:21 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:37:21 -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 15/27] ASoC: codecs: pcm6240: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:37 +0700 Message-ID: <20260630063449.503996-16-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260630_073725_892806_2039F4DD X-CRM114-Status: GOOD ( 13.54 ) 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/pcm6240.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c index 4ac4448ac3c8..a2b66eae6ac4 100644 --- a/sound/soc/codecs/pcm6240.c +++ b/sound/soc/codecs/pcm6240.c @@ -12,6 +12,7 @@ // Author: Shenghao Ding // +#include #include #include #include @@ -605,7 +606,7 @@ static int pcmdev_get_volsw(struct snd_kcontrol *kcontrol, unsigned int reg = mc->reg; unsigned int val; - mutex_lock(&pcm_dev->codec_lock); + guard(mutex)(&pcm_dev->codec_lock); if (pcm_dev->chip_id == PCM1690) { ret = pcmdev_dev_read(pcm_dev, dev_no, PCM1690_REG_MODE_CTRL, @@ -613,18 +614,18 @@ static int pcmdev_get_volsw(struct snd_kcontrol *kcontrol, if (ret) { dev_err(pcm_dev->dev, "%s: read mode err=%d\n", __func__, ret); - goto out; + return ret; } val &= PCM1690_REG_MODE_CTRL_DAMS_MSK; /* Set to wide-range mode, before using vol ctrl. */ if (!val && vol_ctrl_type == PCMDEV_PCM1690_VOL_CTRL) { ucontrol->value.integer.value[0] = -25500; - goto out; + return ret; } /* Set to fine mode, before using fine vol ctrl. */ if (val && vol_ctrl_type == PCMDEV_PCM1690_FINE_VOL_CTRL) { ucontrol->value.integer.value[0] = -12750; - goto out; + return ret; } } @@ -632,15 +633,14 @@ static int pcmdev_get_volsw(struct snd_kcontrol *kcontrol, if (ret) { dev_err(pcm_dev->dev, "%s: read err=%d\n", __func__, ret); - goto out; + return ret; } val = (val >> shift) & mask; val = (val > max) ? max : val; val = mc->invert ? max - val : val; ucontrol->value.integer.value[0] = val; -out: - mutex_unlock(&pcm_dev->codec_lock); + return ret; } @@ -678,7 +678,7 @@ static int pcmdev_put_volsw(struct snd_kcontrol *kcontrol, unsigned int val, val_mask; unsigned int reg = mc->reg; - mutex_lock(&pcm_dev->codec_lock); + guard(mutex)(&pcm_dev->codec_lock); val = ucontrol->value.integer.value[0] & mask; val = (val > max) ? max : val; val = mc->invert ? max - val : val; @@ -702,7 +702,7 @@ static int pcmdev_put_volsw(struct snd_kcontrol *kcontrol, __func__, rc); else rc = 1; - mutex_unlock(&pcm_dev->codec_lock); + return rc; } @@ -1645,9 +1645,8 @@ static void pcmdevice_comp_remove(struct snd_soc_component *codec) if (!pcm_dev) return; - mutex_lock(&pcm_dev->codec_lock); + guard(mutex)(&pcm_dev->codec_lock); pcmdevice_config_info_remove(pcm_dev); - mutex_unlock(&pcm_dev->codec_lock); } static const struct snd_soc_dapm_widget pcmdevice_dapm_widgets[] = { @@ -1890,9 +1889,9 @@ static int pcmdevice_mute(struct snd_soc_dai *dai, int mute, int stream) else block_type = PCMDEVICE_BIN_BLK_PRE_POWER_UP; - mutex_lock(&pcm_dev->codec_lock); + guard(mutex)(&pcm_dev->codec_lock); pcmdevice_select_cfg_blk(pcm_dev, pcm_dev->cur_conf, block_type); - mutex_unlock(&pcm_dev->codec_lock); + return 0; } -- 2.43.0