From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 AD729377EDD for ; Fri, 10 Jul 2026 05:07:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660027; cv=none; b=YoyFlQWX8mBOs9XJIaAEUr2yfNnj3EYrZ4kTjkx5uVwZYXybNUVyKA3vyKEo/7Mp9A+2sJWUi5sWHgTXhvsPWyXg3zzUdTCcpvtomZch95//tYnHQu0kIl+bwE47fWbX6WpHNcSmc5mNimZ5zp3OYWmjyMN1HbwMtBNuOMp2oK8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783660027; c=relaxed/simple; bh=LPFWMIGlGHRB1wDJeutRakClbfN/3nxaoe4ODgrWOVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zm9/itwcoxD83l3CI7zvYPuEGxa/8y646Q+rmRmzRUkqT0tTFgmlgPmWBm+N0O4v3y5CgWAw6f8tdf42UnI8OGeMqbIZUF4us9xhQTUPLzuNQO87o3fKz0K+PeXxMipFb15uDsvj6RvakORC4wp3mpNDFLJXmsA7qnA+wiuOPvA= 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=VJ84AkZR; arc=none smtp.client-ip=209.85.210.180 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="VJ84AkZR" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8486ac3f347so926634b3a.1 for ; Thu, 09 Jul 2026 22:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783660025; x=1784264825; 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=cKqRcXDTZ2AUkUtA/CqdSn+DCaTTyr1WUIIDbJXdQ3w=; b=VJ84AkZRZusuL4ZsXyekpgIyG4dONAAtZe3q6TG+iwcFwjddwA8ESQk3Wf3k9GUsQz VizjTOAVEgE2Nl9ulRRD8XXKexAKTiwsq65qqFsomI2OvKn4MfaRL97cAG0nvhptyJqF FFbyLDlIvKfhZSZ+0NSmh44SCwrU1WL+HvjF8HKQGRPaNxv5gpoY4hRnFVMUXYYKUHQW bcnBznyxghbmU/clEQcul23yogjN3NiGpnZagsv4wDZZJTTmK8Nm91i2uvnaISF0FgZ4 dVsNMz+iBzJBAYH8PrKMnYvUxpJ5x5dijgpZ9ZZg1pokJ2fzKECrWAfnuXFM3jau9V53 rc5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783660025; x=1784264825; 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=cKqRcXDTZ2AUkUtA/CqdSn+DCaTTyr1WUIIDbJXdQ3w=; b=eGPjypUqTwOkKEG1p8dVBxE1LyLVAkvFa+ISo6eYR2b2DX0CT/gcP6+sI9rea1xu0m wgoiQJbAUqB8pNdyY5tMsGzYnAL+Jqc6hx5eV3w+CU0k4Se0EsLe3vJdKUpLqMfe/LXh poJ1b0brFSn6svHTf39XyuTCjojqmhmef1XHfqu5xz2RZtHfnGdoOK2VuEj4UnFVG+EM JZwSYsdSFMiqtvwBcv0Klepjda0INwzGAHcHboBzCp1CN930hpK6xh8mTfiCEsnMZYl1 FB2rI4rElQDhs3Ml1z7wHlx8H5hGHt0neA9KvlFKWobiW5y+VDa7/OIep1YXcs3HPfVs nlgA== X-Forwarded-Encrypted: i=1; AHgh+RqXusO9XbXPVe7x8X6680Vswpk9rqd5WGeZoBrEbyAfIlOwjsuQwkOvnMTQ7EbM+ES4fL9p7lMrZ0OQJg==@vger.kernel.org X-Gm-Message-State: AOJu0YzQn/rXGFUEutaxPSpZG+g8F4Px8QHsj6bxdzrrKoH9ZLiyeIf/ pTSg6dRuk3T3kaqCzxQRZyoDOCPDgO10CQU190qG1E8ftQxDY5RHztr4 X-Gm-Gg: AfdE7cnjNkCTKP/BIK25yF5bmj1oQYpf2vtxu93AydV+6L+dQj7OTCwq0tdrfzeLKT0 8z/3q6UujSV2M1lHVY1+wT7aJFS2KOq5DHCKIo/9Nl1Vzs3qYs5NimAjpkCu4Wv1P1NYB9qceT1 dfCXiwKuoSrdchr4A4560NRyTKD5Dwjz+HByN8yhO0Ptnl0xqvOuU/dss4K2lJ2CI8PFimsT3Xw 7uJ+ryXKTj5kOuNfM2VaHVHJvH8lD2ycpBnPzOKDC82GeWT8Vs42G+5NpRrck9HbYq1k3fXnn8w +AqTmA7wBsAQn1pZaksel4Tnbr/LCjKLynapxrUFpbdBUCTDklop9yxo9RqJuvvmlo4+QzO+30M MQxeR7WyqfT3adhzJmPPYcbPl352dyWeSOMlFQPiiSSUSRceT5BUlBZ6omrjr2UjFBEgOTTvtqt 2iO3i+cEKLQGd8n/XEL5zP7uVnLq63F332egzahhWFrcYCqMA= X-Received: by 2002:a05:6a00:b45:b0:847:b45b:fef3 with SMTP id d2e1a72fcca58-84870b7040cmr1847885b3a.27.1783660024823; Thu, 09 Jul 2026 22:07:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84847275fa0sm3400499b3a.22.2026.07.09.22.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 22:07: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 v3 14/27] ASoC: codecs: pcm512x: Use guard() for mutex locks Date: Fri, 10 Jul 2026 12:04:58 +0700 Message-ID: <20260710050511.14439-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710050511.14439-1-phucduc.bui@gmail.com> References: <20260709045902.498848-1-phucduc.bui@gmail.com> <20260710050511.14439-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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 fe3b5011fa16..88e235de1107 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