From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 52B84395AE2 for ; Tue, 30 Jun 2026 06:37:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801447; cv=none; b=l3J9nNhYKBdtcnGKHtwYSEOPAXSczjIL0qt0r5lKThhiNnvc+KK/OLBoUtgppFcgGhhfjlIZtvYJgWIJujlJKuSjsgj6jUTsUURL6o40BhzS443rkSYDnsGILFSCky4sEGTYSjTJcGQnuhBw92fKEWeHJRYAHR246MiXZg8upY8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801447; c=relaxed/simple; bh=FowDvka7morxmU61JfAbx98ngYcmtDC/p0DW+ZHI0sA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LEf36WVEl/+VRKocQhTHhYfeQ+XdNo8g1pcUSn3SK74gMhFeiMcJrRFinnxj7A2zQlSbKtvNy70+OOgszUP8ETtG6+wAUmje0Py3zfmQ1Mfg/bhhiJAStQw6/DonaIyif+3J0oGIyIYfZ3x9bQYgrMT65VKvQ1yLI8YCARXZn8c= 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=Mr8eT3qY; arc=none smtp.client-ip=209.85.210.179 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="Mr8eT3qY" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8478a25f268so1051014b3a.2 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=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; bh=HsskFA4Wkjx/t3Sa3T1ax8m+7J1jxFkrWrIh8Ok9CUA=; b=Mr8eT3qYAIHFQqVuRYmdosPzt4w4YYlxgpJ9R4Hx3ADY1DJQU+4LTmtb69Ah9wK7PV 9FJipcHKppFFiNvd/ayBZHxNC3z+fY+hj73kM6mQQj2PH2VW4Hkno5AAn+/hZwUFk0qP cgNkuncjiQSVEqQbS4N0wA0eikdChdvp8rWTHaNgKKC1DepuQAl6hXmu81QSybz/7TQc +SIBOiCt0isLaC3eVBL3qFcY6eESe/Cj+OD7iZ7MilL57KqNBGX42a+qCB9i/dsi2wOH RV+86PqkPj5Cnf06DPeOhGCMlMfAwYE/OUWn7AssyyudNuzQea9XfjGOypqR2idyHGoF Sr0g== 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=WSWTvfMv+WSp/RBGUM94QaGUQaN4VLonBKu6IcjzljrXN4ovu9j/TGYp1yuY+irnEQ J2Dvr2gD2JLLLQNBzBt2EMwxou20eYMPPLC60AF9LVXu+pHh+7UaqEvZDAZigRRiGxo0 w8OnAfe2EPVDyj25r4CHmimUxMJJxVgxu7cKkFgIhNNC4jcDZuyIDBWf08hLHV3gs+Xj gMbCLqoUnlUTsV6a9Hsxdu/OLatreDouquwTKKicKajTv6GYfMj5c4+OUAMiMNcSy7Jw Ib7YT8O+HoYzkcNuDppUBHYOmOqcOTyy4Hr5a2H7nGpY67k5IHSGvwZgizVVxp2SpQFa LZTg== X-Forwarded-Encrypted: i=1; AHgh+RqJy3STAE/0Be89rgdRMoa949GWv+Tsnk4Pi+iXOpZpcuedc0TTCAuTxtWy0WMLNSJgNCEYsdIUh/Ct00s=@vger.kernel.org X-Gm-Message-State: AOJu0YwYMW4UPQzO+BDeNAQfNQe1rNToJByDoTIWq71lmAbmAKL0W/nW ZGqsI9loKc92fH5g8mM8LRtIq9BUMYUsPD1MoojHNBoztstmWn/eiY2k X-Gm-Gg: AfdE7ckMj7M4qEobjsPmL8YHM1yAnaBSRaOfcqFxyeVnPL03wQMkrtJysiq/0vbYlbs 5cWWApO0cLuRgXGvyCOdN1JOf6grmGZxbEMVfHVUvyhWXclbR3HGEtzARMgIwa6ZbZgxp3vTImd QdD8DEUYPyoNRgrvJCADOl2DlLBJAke+nZ+qZuQyQi89TrpDWMbjhh0To6fJS5Wa/PC6p3d1s+k 3f19kE58IhSY+XqxOVtmy4iaAQajTttT6c9xv3T/oQa2SfqIOLX9dyFNmy3P0YqtL9tAtKdqemh tH+6ejOWJtCy7SmIphx2wwbgZJaRvrIJGN0zIGeG3qQZDrCCgdljujjd4pekMgpVcoBipVYBs6X t1U5ioRwAJdAaB3K3pqSGdDndyP7Nq7sszJAUOTXY+61tUy+Yb642+GTnt2IBvyy/Lvkk25ATM2 gJuMhe/fUcgzrJwJnPEjAcHLrtsuvVvJhpH6aFrzFg+k30Ukk= 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> 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