From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.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 7692C3812D1 for ; Tue, 7 Jul 2026 05:14:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401270; cv=none; b=EzVWsViwH+YcYv7viEBx+WI+d5C1GbN4dowBKeCaJzGWkj7K/qXhCTOH3GwFIQ3EOQ3xcatGCBVkpruSPCqyotWBZ2V6TB9UTwLcQk3MFqJ7rAwh0WmDpE4YjrnkqXNEyvK8GC3vnqVrde1CkqRFaZDarvYOX2fqprlCvrFHDjk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401270; c=relaxed/simple; bh=7j86E9nXxZplFGdBXN+J5/NJOmhWhrCy33LKfn8VhNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vh0EC8Cmwl0m9JCYWBUjQbVKa+5lYb6OwA4tQb4sCG0uXZ1DOOPHT63QSgsgw58b1wMw2bxgWeCX6YZYf7lvI27xACdJLxSfEdOtHM7naD1+S19+43njvkFZSK7mWclAk0pHpCeBcXAbPpYyBJ4k79ooTiw7c6R/HDTbbO77qX8= 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=l7Yrxdk3; arc=none smtp.client-ip=209.85.210.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="l7Yrxdk3" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-84832ec2615so99970b3a.1 for ; Mon, 06 Jul 2026 22:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783401269; x=1784006069; 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=cp/veyII4HIQI9OcBqFYAzKDNTS/IeWDlODSVw1jz+w=; b=l7Yrxdk37scz45TsyCDxcnS4JsXu6gGa0+f11JgbhJX2+3ITkwQL/dpMADCunDZtBD nv6GiPW2HfaBWjei+q5WKQp3BiJ8F4bgtMZA+xfYeuhiKVV61DL5U0qXYJuh/hZx/Ksj C46Of7KY/d3T2KMqHyN+9zxcqvwuyeAIC0HJOubAuOTqcLWZZpCUu92UPv5jkO8XoF/2 WfSNlRCc+G5AyJ/JJ4zIHeYGEJqDTsNFmtC6RA+HPOgw3CKjhV5Bhu5/coh6+dKIS6TR cY9sU1HZavo0un5SfZFcVRCNwo365cEtqlR1qzqYv6n+/DRLDmea//fZ97oW/bpu4AHU Od/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783401269; x=1784006069; 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=cp/veyII4HIQI9OcBqFYAzKDNTS/IeWDlODSVw1jz+w=; b=VHqWCNTz4NpN/wG6TaMp6psIWQdnoa7cwibAdeFT5khUHrt+KZtsaxgRLNn2y8jDe1 7Yp5EUStBa8kgNqmzMfBWoRQWpmMZCMSLATC7Kb8KTrjnYejqInqwoP4r1hLkvVEk9j4 K4GmBBbdyciHAMzR3I5rlKrcjj/51FvTRxoAn2+TdL6OzN43smR01WekAT97a++oDcpV pj3VFnt/9nHzuLGk43vjJ0VsD2a4ydPXutqcMPYrw8YNf5berlCcH0jIqehSxXhc1rXw yXPIMIayKUO6t8FdW+G0JFFMVErOCLAV+mINgOz7xuj+RgKnhbTkzNXUH3USyv08UgNC sCaA== X-Forwarded-Encrypted: i=1; AHgh+RpLxCjaK826Nab7icRU6wOpVY/B0/ImqcMV+20liP4FYZ9CDVOpMc5TxqfciITEVCghzlzireapoe6p3R0=@vger.kernel.org X-Gm-Message-State: AOJu0YwKGh3GkLSpoDwne5f6xBCgjRRb4iu6LoJX6rgkxs/MI/FTBtkJ I1pvxFglC+Cf8gg8NKT5bv4DneWcDS3LYPGbiXF9u3q2E97Z4Cmp6MJv X-Gm-Gg: AfdE7cnlmjS9JWqhjJBt6tlRHV4KzpqIlsJ5MwWCvNLvpqNZvqopW21ZnDc6xpIYKn7 BVdm6YLTkqzodjwvVlSBHc5CZBxW3mDLNrrFb/h8y7AUcLp6rMgMV44Jx9EvcvE5L5w5xcGVu2L A3VT8Louy0tTs6hTDzdiRgYSclTqt+AmMfp5F1OIZ3N45ffVNluNdIp9BPF3P5MchLDOswjHP0y XeWa7Vw+Wm24XVnYMQwZTVtqfmS/adSpgw+moLpVtuEvciL9D+R6E9LPh2EuieU9TWuSniX7F6O VqQyASdyeuesisO45Rpzcu+XTKI62oYGqF0l/NwpDqCDLQD9VsjEmP0i+QpcYTv4sEvQe9z2IwC 3jIDms5rvqd4/rLPr4/V/sbmS1ZUFTeNF8fKl9RhvtC2VF1ufkOacsqRWPnGp5CLETm5u+la023 SglkWVkdlwL8I3/UQ6Kt5gO8h0+NM0XWrln8SFNIUEp9cRm2g= X-Received: by 2002:a05:6a00:2d18:b0:847:871a:94ca with SMTP id d2e1a72fcca58-84826d24b26mr3505351b3a.41.1783401268848; Mon, 06 Jul 2026 22:14:28 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d4dbdesm4728495b3a.31.2026.07.06.22.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 22:14:28 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Tzung-Bi Shih , David Rhodes , Charles Keepax Cc: Liam Girdwood , Jaroslav Kysela , Cheng-Yi Chiang , Guenter Roeck , Benson Leung , Richard Fitzgerald , povik+lin@cutebit.org, u.kleine-koenig@baylibre.com, kuninori.morimoto.gx@renesas.com, christian.ehrhardt@codasip.com, Linus Walleij , Arnd Bergmann , Sakari Ailus , Thorsten Blum , Chris Morgan , Dan Carpenter , Marco Crivellari , Rosen Penev , Weidong Wang , Teguh Sobirin , Val Packett , Luca Weiss , wangdicheng , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, Cezary Rojewski , bui duc phuc Subject: [PATCH v3 23/24] ASoC: codecs: cs48l32: Use guard() for mutex locks Date: Tue, 7 Jul 2026 12:10:05 +0700 Message-ID: <20260707051006.20058-24-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260707051006.20058-1-phucduc.bui@gmail.com> References: <20260707051006.20058-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. Reviewed-by: Cezary Rojewski Reviewed-by: Charles Keepax Signed-off-by: bui duc phuc --- Changes in v2: Removed the unnecessary else block so update_bits() is not called when no changes are needed. sound/soc/codecs/cs48l32.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/cs48l32.c b/sound/soc/codecs/cs48l32.c index 086ed0f57a85..a9967771124e 100644 --- a/sound/soc/codecs/cs48l32.c +++ b/sound/soc/codecs/cs48l32.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -236,15 +237,13 @@ static int cs48l32_rate_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v int ret; /* Prevent any mixer mux changes while we do this */ - mutex_lock(&cs48l32_codec->rate_lock); + guard(mutex)(&cs48l32_codec->rate_lock); /* The write must be guarded by a number of SYSCLK cycles */ cs48l32_spin_sysclk(cs48l32_codec); ret = snd_soc_put_enum_double(kcontrol, ucontrol); cs48l32_spin_sysclk(cs48l32_codec); - mutex_unlock(&cs48l32_codec->rate_lock); - return ret; } @@ -2242,7 +2241,6 @@ static int cs48l32_dai_set_sysclk(struct snd_soc_dai *dai, struct cs48l32_dai_priv *dai_priv = &cs48l32_codec->dai[dai->id - 1]; unsigned int base = dai->driver->base; unsigned int current_asp_rate, target_asp_rate; - bool change_rate_domain = false; int ret; if (clk_id == dai_priv->clk) @@ -2284,19 +2282,15 @@ static int cs48l32_dai_set_sysclk(struct snd_soc_dai *dai, if ((current_asp_rate & CS48L32_ASP_RATE_MASK) != (target_asp_rate & CS48L32_ASP_RATE_MASK)) { - change_rate_domain = true; - - mutex_lock(&cs48l32_codec->rate_lock); /* Guard the rate change with SYSCLK cycles */ - cs48l32_spin_sysclk(cs48l32_codec); - } - - snd_soc_component_update_bits(component, base + CS48L32_ASP_CONTROL1, - CS48L32_ASP_RATE_MASK, target_asp_rate); - - if (change_rate_domain) { - cs48l32_spin_sysclk(cs48l32_codec); - mutex_unlock(&cs48l32_codec->rate_lock); + scoped_guard(mutex, &cs48l32_codec->rate_lock) { + cs48l32_spin_sysclk(cs48l32_codec); + snd_soc_component_update_bits(component, + base + CS48L32_ASP_CONTROL1, + CS48L32_ASP_RATE_MASK, + target_asp_rate); + cs48l32_spin_sysclk(cs48l32_codec); + } } } -- 2.43.0