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 C5EE5C43458 for ; Wed, 8 Jul 2026 14:21:24 +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=lOyxRU53gUb5B8dC48/84m7uvy ajtbawf2mkMw8co4QOcsXgFcVVC+5AO3orx3aMMucyR84yAxDiOcBHS9xDZ9z8P3mrPxhZ5/NabvR uacveaRxeivE9vUkbZf0q8lFln/13tFNYAsORNiUMFyF6vvOMq5kkGYbRDu/XcQHL79HYJ1weP9QF aZUD4yAfEuiPZr9r0Ec5sEEvPuc6YM0QC5+WuPGgLAu58UFfUaQhyYyOmGnUriblzr/rPZQuPR9S9 qYq7AfukIXSHRz+Bxl4mPdTqgyqq14VIJoVoNEjfyRlVu6C4La7A3kiZm04YB98U3iV0AxvOUMfF6 5XWv1sng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1whT9K-0000000HHgG-1HPn; Wed, 08 Jul 2026 14:21:18 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1whT97-0000000HHXV-3OeR for linux-arm-kernel@lists.infradead.org; Wed, 08 Jul 2026 14:21:16 +0000 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2cab973140bso9599255ad.3 for ; Wed, 08 Jul 2026 07:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520465; x=1784125265; 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=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=okB1n4J9A6QOAy5V6dq7nQ3oB9wla+6G7R+H0nMXKeR56eGbY+NEop3gL7bMHMdMnQ B8zPh8OqgeBzPiYPw5f8IB8FcgpItWtkHGEpU6fFkKLxdUVnpVdxNCNRzresjwckT3jM GINhta/fRXVa1QpOiAxJst6Boe71XKWg7c429D+Hj/Bt6wGsItrrwCmXs0mRYreUvRMp x7ams+Jb2OeixacQhTzXN6y1NO0UctapumNZBoc276n/Orud2afJJhCSjvxEymSImW5O +Mj/T1V1+UyGGkMvzIi7mli/sWZrNZ/ZAffxG5PONwTuDftd26gEzzoiuKoEq7DjjGyZ g5ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520465; x=1784125265; 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=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=YhSX1VSzkGAHJBocqHMOhL4Hv6iCkW/P3PdblS16RoQciWfxn/2tQPvSJE/Dzvrw0L zduUUyrW7FS2Gr5pgh4w+VoFb2F4M0rF6bawpP+MeyYGZukrpDjxa7R835k7tF+xXqtn ZqA5yTE/ny/EOfojA3sfnG333oPRVFdKoiwGWFAasECKXp430308U0N4fkha2/H8ZZsY 2P6P6bRvQ49Ufe5rSlF+qviopBEoeWMJaZhywwi0h0Tjv/hEtOVF4mQpc0x0oE4GxVAu 0/lJpZINzOAs1sVZZj2wwSNfYdX7+OkPCOti07KAqxIFKlk30m9Tqrn6bY2w+rkQBZhx xHQw== X-Forwarded-Encrypted: i=1; AHgh+Rp+yXimE4hxNlizrx8Ctr6LBSCepvoAaX1/6t1FynzXzsS3DNSms2TZ7sinEeBQv32xCmJ5J1LyXoqS/0CIpypI@lists.infradead.org X-Gm-Message-State: AOJu0Yx+C9q6hAlMkP5aM1kEax8bImMtXFls+ZM20V/LUXeMttqdDXLP 3+1+dT1y26IY9y9qFuttFD+wuSlW/aMUOJ2Eyq0dd6nYpSR9NEu+wndV X-Gm-Gg: AfdE7cliqEvoaCr9dHfuN8hFORP0xu0KBclnSMKItfR/aPOTr0dg+2hJgkqq8Kiog0T tLNFxOZQ9wFJNAnGc2K9QAvqiigklqQEurj7iSqBlvGxZunoG02iHwBkFJ4kdcnf7DOND+t2Y9r 2aN3tyIPOXRFOnPB/5oBsWj4gnwhshlOyLovWdVgWqQMO2jbLpqXM3jK4B3t+r1Gi295SDLNXBi uZSTZ6jvCuwkJ7qxYIVE/5NlTflxgP75Wv+3ma8PdEB7wXiNls6YZvLx+ZTtsgmnH+HN73H4P4u tcE2FjrEfTa/gBGuSaqqLxQX3m/zni42dMhNIJ4NOaM2N1tixwpQXsylw/AgQtMEfmBp2CETNTh Mt1Kb8ctS9NoowciM3PPnjLxeklBqcp52xPWEdy98qffGWZyNvNYfsdP/0GC1bjU1JeKneFXUa1 gkAYfHpJmkzuvXH0K9Dx8H0U46Bc558idsmYc0kW/0uQC0S9A= X-Received: by 2002:a17:903:110f:b0:2cc:6018:f030 with SMTP id d9443c01a7336-2ccea388b1bmr30568515ad.14.1783520464839; Wed, 08 Jul 2026 07:21:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:21: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 v2 15/27] ASoC: codecs: pcm6240: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:22 +0700 Message-ID: <20260708141734.578926-16-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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-20260708_072105_858779_390F0C26 X-CRM114-Status: GOOD ( 14.16 ) 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