From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 68A224657E3 for ; Wed, 8 Jul 2026 14:20:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520458; cv=none; b=GoVVr/XJ3BwONGEE/AVOu9j0Rx9O/OQAd/RrnNAVIocCCDh51iu/fGkLtUUuhR+Ht1HAAw/m2GxjlBxsyheWcr/1U5Dc7V0DXl37Yr3SVoSoBo0sluxVT1Jf9sdjkCvXGCIKYHf4ETouItEqoxtGKtkSFikASCYxIOJt8MwAEFo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520458; c=relaxed/simple; bh=irEDa3n0ohK3TQxzcb1dCcz25OmFm3UBow1veHYd1Gc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pTbVxpDlYSWQpzIPtZdZlX30vp5BI5YyM5n9tMVGBziw32jWzKbzmlinToKRa30VIPqbn1t3XhWLkJ4MXpspGp9t/BbDvKWp9vKawzIwlWcrvjjhrjtSjBtlSy/YVOMofe1mNpye0d72e2zX6NImV52q/9EGf7y8taHIRGtdvO4= 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=Gu7Lr8lu; arc=none smtp.client-ip=209.85.214.171 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="Gu7Lr8lu" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2caea3f742bso12788725ad.0 for ; Wed, 08 Jul 2026 07:20:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520457; x=1784125257; 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=tdURt4n+DcvB8vUuDlvqMqiJ0G2B0zktNvndjJF0Ruw=; b=Gu7Lr8lujx2eXN+/5uTyRrP8p7qx1fOkDR3b3ZNBarOLnYSM3vrMB+ei6y8yqVSZl4 JuUoopsHaoCW784Qu/nyBWJP7tz++SAZeYMnkL+3TDlg2HFN+p70JCnaKyQqZASNvQGo q9Ph9ShlOZJlNAat+GhGJXn1MnksQAaD1KtiiuAxa99dVROZ4sgHn+sXucTKKyRG4moO xJpE23ieDsydYdGdSWWkBlOaFahOIypTFVSPvJz1hj/7Z7NsF4pcrBZ/wwk5ORFdehtS OeFEdUouKo1DzmCOsnY56o8Fz2nnl8CZjw7YNpDUfB4GDMxNUuobZ+DTWRgxhwhjYMii j3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520457; x=1784125257; 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=tdURt4n+DcvB8vUuDlvqMqiJ0G2B0zktNvndjJF0Ruw=; b=pHyLnM8H14IjkeAqkJ2LWA0zkuPvVp7f84w3vhPE6XyfEjVONuVrv0EcsPV9gWqu/y pryPaNyfjZ/NbrRbJMzhGETuLccOe49JLWnMhl7OvcOUaSgZSZfTYnUt8jl61aZUkDk9 Kk5Gmz7wpWrEKXCt03Uc4MHterLCJobxGg4hB4743OccXLXXb0SkwI+KEaQJB8LaLsPV hebC/UvYC8i6OB6csUGSvy99DRdFEhNn2ZAEzFCOSzGrEX3nN/Hw+Mk3QMWBHUpcexUB wJ5dhyg1Uw5Iz6kSeZoNvMpH0fz3SyjJ+/0OxoGrJxjloay6v2COkXlFSY2frUYP5AV2 HmYQ== X-Forwarded-Encrypted: i=1; AHgh+Rp+qK43+vLHFO0hJdElEB+M2pCW1HWD9mdwxgBt20x3I0L6BJNbRdeP8NPmFwAQKk9QqFEw9e6aveEITiw=@vger.kernel.org X-Gm-Message-State: AOJu0YxDvb+zKiaucQVNf9KCeKgoOtGsRKagI2eoHk/K267qnhBm4mVn Xt1993v/GjwGc+RcVm3UgcmM3EkdNzRpLMqvruRc2PWsYKh7RggwD0Ij X-Gm-Gg: AfdE7clYcyo63SSj1k1SjTFCZ0N0qUXQqwKzLx2oR8j5osKNLdQk9YXMMLD8WBERGcm 4XZq9p/0EzLS9ebF8KPg3QGd7Mfx33ZZga0UN7PpfDTQLo0BjewsI3+7FQFvOHeYpmg0rGq0/iH BnspVXRXqmWQNGQ6OAtkVIZ7UGHymWWl4X7obIExWzpt0xQR4RIbY2us2oBXv0Sqrl2FBTb0cj6 5le+k51J6d0dkQ42giTpWYCsF5FsboZ2kermhWWL1Fr1zSBwBbGex5ztPEHmK6t7a0f7saPqbgz ySmAjYu5/q8zJmqKzNwQ6ODmCbg+jd8UjuLBm0kAv3vj6g3VhS9oYLJJ6/LuRWMkq6e0lcGyd/3 FEHK4CtcnO+IauvtUeKa7pC7q/ycpNAUD5zQQk8DEXnbfZ0iGcdE4+5MFOv5KAGi0Yzc4Vn3j+i L2zRL0+4zkSwyKVQA0D1xXEWvyjxS7ZjMx1Jl693WYQ4SEo9I= X-Received: by 2002:a17:902:dac3:b0:2ca:4b7a:4a02 with SMTP id d9443c01a7336-2ccea599232mr28329495ad.43.1783520456871; Wed, 08 Jul 2026 07:20:56 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:20:56 -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 14/27] ASoC: codecs: pcm512x: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:21 +0700 Message-ID: <20260708141734.578926-15-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/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 fdef98ce52f1..bc777a53dff3 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