From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 51882364038 for ; Fri, 3 Jul 2026 05:57:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058274; cv=none; b=h8Cc1aCTA8DMvOwiW9okJSsZd57Of780cixauriOxnQ0zd/KbLvG2zaOq14gLzyn4w5bFKUqyK/fKu/kB4RNcUEHQmQYPotD1fghc0KzOyFH9+fDMexn6b9XMeSsio/cxPiAzMNnYMb5IJjWfR3RsNB7F1DIhYF6rP3v5U+SI0A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058274; c=relaxed/simple; bh=MHB+vjFfWlUHNNfYgxS6YYgiZANX31/DVhBYct0rLOM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aYaGttc+MrbOiNctZ6cjoFg6Iz5By8T5397GIkHfPDVDtt139xrvE2THM4kQNdR0dgCf+YUuqhdCirNfp8Oye6zmDcgRjdiKTHTQJbLg4zsP86d8xoWusnj0oUqjdZ3CzHTHnEBvvP+7Dce7LgoQoqOUIeBYNhXexF3g0S4SWWk= 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=ECxPD3hu; arc=none smtp.client-ip=209.85.210.170 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="ECxPD3hu" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-8471013fac2so166508b3a.1 for ; Thu, 02 Jul 2026 22:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783058271; x=1783663071; 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=8FzZIorP4Bzh+1kJvRnQPSqCkVRQdA0Z7VAbqDN1WCU=; b=ECxPD3hulLnSTnIeuN6ltGS0+IU5XAh8a0GQHckp5EiTvUi5X4aEQrHKrIrhYO3Tsw 9PkyXrWzLdnJp2erI7TFGwD06iwPZn7JBia21MZs0ttkiXMefksYEK4YJ/5IRHUboslz rjHZOu0TSG/iBRqCSaslgpM2TJJFEnDiPLKo2xQWnROJzsDG+4e2MrCqYft5LXvjKyaS ddd8h6gs9lP6sZ+dHfvDAl6PicZNW9gty52Jj7sg1cb8TOWzYDyOmpFIAYEZ4TuJed2h U38anJwYbflOLcZgTAWHPOm/iwKwr2KW/0XErsL/K2rzTkV5fk6jwmIRx24W6mbRq7G1 CE5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783058272; x=1783663072; 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=8FzZIorP4Bzh+1kJvRnQPSqCkVRQdA0Z7VAbqDN1WCU=; b=I2uC/3KEtK3xl5VRbVaNQRHMM+i6fSPBLBtYSFxbVMh0adYV+A7qKvkUTaNixAJLuM DqrhsPm2XVhdrGR2A0n7/1Bz/N+bCIJ72ZFvndno5gDEjOAItP8B5H2LFWPy390NUrol 0C9ZZ/wv4ZsIaqASKRZS5FQHnYayTngTmQJ67TmadM97FJO5W1/Y1i6acNMnvoZ0zD31 4y91VPIAiJw9PG3goEc4H/mLh/JoslSy6/+y2j9paXm6iTAMitlChIcwvJ1MDNXovQac DYMXchQ5pTfKXOGjxiq4NZ9GAxFuYIgALubit43KQyc9dETmLLwbk3rOjSA3xp6D6HwI l7mA== X-Forwarded-Encrypted: i=1; AFNElJ/46TXdJRkIQgrW7HYXWv1EEkhk7oqi8egQGSznpVp2qWJJ+w8XF7NW/zegZgz44NxwwwLH9mfkLpPGkoI=@vger.kernel.org X-Gm-Message-State: AOJu0YwBJvOcqwkCuufRJv8w0ibz0EcnkjM3fc/10VdKZg1v1p792Q6h po/24YTKBC0bDQGVTqwmStx6YovEF7oEVYUkfwmdJi1tnm5TD2pQmofy X-Gm-Gg: AfdE7cl4LEATN/YSlek1Kmp6983MdVM5IZJOGK6RbBIgkedx7gQpffMjwUJ9uA0JyxG O22ZFbjdNiYcHlr93KWZNEs9WCvps6JGhC01ts3jvUW8R0a5rIG0MTSYhICnnSWUv/2jZM7be2X UFJT5PUfj/xbNkyutYnSxGvC8TvokfBVO88lyUGu+MEYcdKrpiam6v5mb66dTuEvm040rMibzmN omwnQB1m7TZ67orDIv79K9xmwQUAiH3s3YUvZPEiOupcYBwNgwRABYuPi+iYPBPfJKwgxLDHknr O59Pf8xs7/duPTzOdt3TXaOz7rR4P9DhgsLlApO6veu6IcsmDw8FxwGwMAfTENWYkxMk0uX/ili 1rNkM36jL0KAfzCjNQNyhiu2VeQwI+4OpitbaW3llLsUF9DWqReZIM+M3cAY8b6I1kqNFWvriFI BEzy0S6iGSFPDKqjlaoNKrp8tm4bVaXK3Mf/bBQzmIBU/sqH0= X-Received: by 2002:a05:6a00:944d:b0:847:83bc:d2a4 with SMTP id d2e1a72fcca58-847c068623bmr7752438b3a.2.1783058271534; Thu, 02 Jul 2026 22:57:51 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847cb94b3e6sm2340028b3a.33.2026.07.02.22.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 22:57:51 -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, bui duc phuc Subject: [PATCH v2 23/24] ASoC: codecs: cs48l32: Use guard() for mutex locks Date: Fri, 3 Jul 2026 12:53:54 +0700 Message-ID: <20260703055355.244898-24-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260703055355.244898-1-phucduc.bui@gmail.com> References: <20260703055355.244898-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 --- 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