From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 3DB1635E1A3 for ; Fri, 3 Jul 2026 05:57:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058247; cv=none; b=PEzFXMyHx6VkKroFBUBthxYb0lIm5/MTm/ZgPzrtOes08RFvUBG0U/4m8/JvjQT0icOR26NKE+dO9LSPphOS4XACOqs5IJF1J52b7mJQsojCbk9/6kXZ5LEh5nULFkROZl/Cslfa3eZHybXIBGQs87drPqkYAVx9nW1T52O9qKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058247; c=relaxed/simple; bh=l6qs5I0JUI9K1DiRIyWqpra8GOK6b66PJxrAnmuwY7A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Uk1IenUXKx4MBo5bv5gV7rcpjdELPH4GX7QxcLj4lFwHrAOnkCh3wEJJc5KwB7LpJGguFVzO06wQZkPFNwNuAix0mOxWJpIl1Jb9jPN8KDS6Kz62uz2mxqtHeoW7F8ExicbiG9icbXvsYp+AM0l66TkUDCPWG3X9yxYKzzB5Mmc= 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=fWybLose; arc=none smtp.client-ip=209.85.210.173 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="fWybLose" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-8454160043aso194448b3a.3 for ; Thu, 02 Jul 2026 22:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783058245; x=1783663045; 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=vUf2B3EuRxEbD2AxXAzHzC6DSRPTYh22ar9PET4jqsg=; b=fWybLoseD6pONFQfLUmHRCa8z3Bn/rWHopvvt9527odjBagqOigACwOpWc3weIdOWh XV5TIXKZeazWsVV9g6UnQN+TNvsJuHywI51nVpIj3ER0rm5zfcJaS2QSVoJuAJD5mbNj xLHL2ZmCirI+rUDBnicSzFZHNmnsvebXjE96nOzx920hHM4mJzrdFJEILeoMgYWIVpH0 jsv8WbOliOBs05tgRxmlvL8J1y38a552KcJg9gZy7zslhJKAdiTE1i9U/JBAuZmRNj/w OA4GBA9p/gI0WO90nSa36YbqXcqFd+Br8Fa5BTvvaSr/XhCcOBz2lusNYvuKNSdHEU/x Fm3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783058245; x=1783663045; 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=vUf2B3EuRxEbD2AxXAzHzC6DSRPTYh22ar9PET4jqsg=; b=nmy2ehumdMGEmSJR2xXXhdcoiPVTdepALu6fQEaf7bs2ls+SHRgenzEtt6vHv7zQ4z RBnwiWVOQtGfIOx+Z03CtFBnevgHWfKOuSM9CMkdA74LCHN5LHSducQJJLp9YY7rL95h 3ZmI6lfa93tGlwbEhB0ANED+OX1eB31AwYICXxo9q3lGhBA82gb154+mEz8vX7jbCLdk FzCOkTD2SXsGdb1TzhH7JnnYmQk18mR5K3z9ulX3Y/bcOBn/R7K9toUSfGThPjjeME/D CokBlurunYHRl1KjOdi9Bcu6kkIAUwVk/NZzgh8rGr/p3SJGloRVob3P2SHdyVbGwH3k 7G/A== X-Forwarded-Encrypted: i=1; AHgh+Rq8lPRkGnrTgSDylZCEQBpRp0RwL59HnO7v9MFeT4lx01uBQMEBqO3I8jQU5b1QaVfItdJ1mi7gW3KHMi4=@vger.kernel.org X-Gm-Message-State: AOJu0YyPQW8ZU8siIKygUp9+BYI808LiyGb5twzloMn/BM1/2NCFxqBv yZNw1u83LQnskcWDoOogRzEccT06u3GwgfUJqedlhK3RZ+7WHU6ryTtl X-Gm-Gg: AfdE7ckDrfg538aE9rj7LCEfVLwnX09BE4UCt326igysao4VYTp6yHlex0FAs0rTrCw JGrri+0nfHdecz4Qxj1qdXYQkPBvy0Ug8J8csklW9o1iz/DLPhmHdZyVVmaQSeIJQFgIu2dN9sn ulx/GhsTPdetxPAvdMoyiCSfkFlspfCzvNVeb6pdYq3f3xv8hL5qd8zIk3Ox9YF22yd2IU+s5Cs WIrqZ+tTdNi9AI4kpr5ZccxJTSuqg2wZUX1C0CJAWb/yeSbopgvywdDmINF/5+U7V1K15TCus14 5XXALCiIl9JiEQ2yvQq3Mj1GF5PR8+41rsavHapAMB3R53rLfahhNK00cl1Xm1WP2AbBSY2+hR2 FFznJfBK5B4I8bcd0Xd5uqNL54AVbTlojZFdNdUfRpiozjzB/Dheld5IcP4iArEpAHbZY9Buu5r Cn/rdlwciHt5X+UuSCUQ7HM0GL7Nn0SR/IeU2XIPuDbIbc2H050X0cAw6pYQ== X-Received: by 2002:a05:6a00:a383:b0:847:8203:f530 with SMTP id d2e1a72fcca58-847c0795447mr9921830b3a.14.1783058245396; Thu, 02 Jul 2026 22:57:25 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 22:57:25 -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 20/24] ASoC: codecs: cs47l85: Use guard() for mutex locks Date: Fri, 3 Jul 2026 12:53:51 +0700 Message-ID: <20260703055355.244898-21-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. Reviewed-by: Charles Keepax Signed-off-by: bui duc phuc --- sound/soc/codecs/cs47l85.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs47l85.c b/sound/soc/codecs/cs47l85.c index 42fafb0b392c..9ee60616c04c 100644 --- a/sound/soc/codecs/cs47l85.c +++ b/sound/soc/codecs/cs47l85.c @@ -6,6 +6,7 @@ // Cirrus Logic International Semiconductor Ltd. // +#include #include #include #include @@ -2504,9 +2505,8 @@ static int cs47l85_component_probe(struct snd_soc_component *component) snd_soc_component_init_regmap(component, madera->regmap); - mutex_lock(&madera->dapm_ptr_lock); - madera->dapm = snd_soc_component_to_dapm(component); - mutex_unlock(&madera->dapm_ptr_lock); + scoped_guard(mutex, &madera->dapm_ptr_lock) + madera->dapm = snd_soc_component_to_dapm(component); ret = madera_init_inputs(component); if (ret) @@ -2537,9 +2537,8 @@ static void cs47l85_component_remove(struct snd_soc_component *component) struct madera *madera = cs47l85->core.madera; int i; - mutex_lock(&madera->dapm_ptr_lock); - madera->dapm = NULL; - mutex_unlock(&madera->dapm_ptr_lock); + scoped_guard(mutex, &madera->dapm_ptr_lock) + madera->dapm = NULL; for (i = 0; i < CS47L85_NUM_ADSP; i++) wm_adsp2_component_remove(&cs47l85->core.adsp[i], component); -- 2.43.0