From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 6AB5248034C for ; Wed, 8 Jul 2026 14:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520467; cv=none; b=gOzaAeOg83o2AmW5gg4EW/qsFcA8AOkicqZSYhTsGx4HcdjB5JyYnOTF+regm9VnG9G8/JTj53EU/rvbOyCrmCRSd10co+Mo04AGFXSiDRYwV99ctg0nwzQ7/b+K8GH9UF/EC//p8xy+9Vd+wQY42ueMBOTr4p/qWGgtipUT1sA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520467; c=relaxed/simple; bh=FowDvka7morxmU61JfAbx98ngYcmtDC/p0DW+ZHI0sA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZhuXUEdjKs3mjgEF+TDGVKVnZegQ1gKvG3UH298uVsDcK3dUVm4paBHbgZAKQo1INS6e1wG4EVFEvBghWsG7+tHmsuO2XiAP46v0n0QMQ/NOtU+cBSJjkj7+kEs23q9gfjAvPW7RcS1K04WvL8jSfZnjmBMfCMEptFqriXTgD1A= 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=m8taX9uU; arc=none smtp.client-ip=209.85.214.177 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="m8taX9uU" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2cc7ef7ec27so10118035ad.1 for ; Wed, 08 Jul 2026 07:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520466; x=1784125266; 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=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=m8taX9uUz6HhuvI1C1gdtShe4ctvAhhon7r5Q7gFqS7KiZCXF+WpUD+vldn4LeubPD gOJB9RSzq8RzHP4ZIShgIwPMa5JxrWhqvMgrjoEaHeUKKFd8y5ncaHBbX7ptNjumr7Km AVOYLLsKZbjQT7lPW1qVYI/JFkR3EP9A5z79drPyourp7T2iM41/r7Z2AeKuBHSHqaP7 7SC20WoQs7REKjNkU83KDBTd7dxbzeXiX8QmAA+Nlgn9Sm7zLB/Wc4hS9NAJOzc6Orv6 /LmzAJz5GjNsqVYRSi17ZFbhAl2/Iw1FXGY5Giz/sPrEtTldCdeDIQZ5oadn0A6wW9Ga phzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520466; x=1784125266; 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=ZvNekgO7MsZzcYURNxA2uUEAfVG67S+cTzQy/yxSuISeaYdr32DISuUQpiase3Gkyn boCCkmoQ7GrrhAxO67eDmkfvf8DYPzIFeQa2FLYN026L4aPxPNIFTFYRV8+EeZm9Hlqw obNAiYOEMt609feuPl8sekn0C4fOv8Had+/B+puOPEmJrDRkJyI8SIP3+4qXIcsxUWRp gVktGBWOXzM9G8KvobXcb16Lgsir+hJNjqnqg+osolXewgBD1MQfYfuzHYzByCF4LMz/ YWUyXiruXTpKCpRQ2J+gu0DzEOPcm/2Z+ghOCX5FC3TfTSzfZLXoGjgtTx2sFH+DQISk v/xw== X-Forwarded-Encrypted: i=1; AHgh+RqrSsl2iZzTFaZ9rWHqcmn84ggGVunGVS0EYXR3Sl3Lei9juHnOkUbxFM7CKFqFqvCzQUUsTr29mX6XB7Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1dnrXoNPuRv47tk4o9KqjaqZBxe+5pIGrtmNNErTU9Jhv11mO C4QeDB1Omm455jvmgxqoLSS/Jo+lGe+gzh/yZcigNVm1ShclGx6xy1H+ X-Gm-Gg: AfdE7cmYy49jr9UbZEYc0ohPMzkttMiJ0gi3QMt00cLkJMIF/6mzoO9CX7RhyUGjN4P sy+EI+Z5dLGYcaX1PotYgF3wplgMceW1KNyDlstVcidq1QO5x1QGQgefaul8HTWF+9+NjDhizFl Kxw0xj3Lb3OXoK+1F5j6nSmDeP8WlyOGX61rImGlFMcIxwVVq2lxIEQui6i1tr6OQLOsmnGGIzH M7e6tMRdiYVP/FbkxRpxU1dlfPZWkSjSfCsnICVIMHtUkElzXgAj7pDMy/P4OEh9S8Im7Haf7Si GR3mBTsh0OlGArlx7hYLjH9+FIWfUzlhoCCaL0+f9DBi6caOMOWQE+ckS18arKWxNMmh0a5cAQT KGaNw11TPtm7kIib4jdMd16XzHgTFGCcRzu3hd0+EIgmScxa30YCNWp8mZgNa8VsP+zFQPPEBBO sZz36gIGKTYxmTpl6TdkhiSl0OQDeOqN7JQeNHkwwn63/7vjA= 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> Precedence: bulk X-Mailing-List: linux-kernel@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/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