From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 A0DBB3D5235 for ; Fri, 26 Jun 2026 06:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454573; cv=none; b=CBAv9YR8k/9v+XTlGu1YSQ3IFaO7YhRgtr3DtzyX1yro8Rc3e1tP6WaixsyPSCqOmLE6ri+MY4mel3LOgypHRzGSf/GGpbC4h/YTscrdN3asUSxBNUx1tfEDZ39vnOwMnicNc+9HHSIMhCjr6+a4zvp2vZCWCCE8TvOtMTTezjM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454573; c=relaxed/simple; bh=T2eO/iN+fiv9eyBvJ231A8TDz5E91d0v4s1m9L9u8+4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NAvUTM8QL65I9MsjmixCfCmi8oS/ZTm4xgHeRXtWFoxAXhlIl2Ng/MqZTUswGP8dDlJDzww0CF4PiITHhJsocEVA53AUHesU+rYOzqSs5/TLsIhFlxE26QRdbykEhqDSD24+N61aJwgVxw8QLmMHLwJy53ruJ0c/316id+RW4Vw= 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=oLHXUMIk; arc=none smtp.client-ip=209.85.216.51 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="oLHXUMIk" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-37cae998401so277504a91.0 for ; Thu, 25 Jun 2026 23:16:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454571; x=1783059371; 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=iSnRj0RszHC9jOxwXFHVU4Untaa2IiDeNEezb4oQ4FQ=; b=oLHXUMIk36wibEusMUc4JD/3TGaoxRecG+xXhahXEHnOQHMIy9AnJpaaBKFiSzfX6q brr45us/MUJnn7h0+498DhAGB+preVHG/M/ETxFNWKcTAnFPoO3bWYFlt/dSSLwF/ggn RxwJQkXO5S76bUlv7Rc6tIa332AmApEGVPIqPMPMDufoKU8d6ONGm7REBXVSeP/8ClS/ J+vGI6fPOv+T4Lh9f/fTRM76zcK3v20jLz4iC5M9zP2i1nda5Cult26cItgLQ58CW2wg bodcLnJgA4l7UbRiHqxatJ8k15R61N+R57dB4g/k9kzIpIuvZ9uMUKlUsxBeG9DgBtAj CRpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454571; x=1783059371; 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=iSnRj0RszHC9jOxwXFHVU4Untaa2IiDeNEezb4oQ4FQ=; b=cefF+e1kLW8JeX48KzgvDCL0GNSrS4DUZubu+bi3cBAydLkh3d1mOXx5JljVcJxrHf o/6mTLNqczK6kEbe3l99bIA8+rF/ZF9bDZ3F+XhHXZ5djhfngdS+d4XC5xZVdGQhfgas ivcfsOQTsalhyC9UAFysyrxQhIie8pz0VbifPq8nO80mHbgkRp8M6xT9VuMnHsLjMZYF 82U6jA/aMkKmj3/O0WeYVD1CFMmQXcvKOjCFI02wDAchMgyNNCLyAhXt/HtlHRI3BeIC XIYn1HLYARfjaecG5rpEp21u/a6GTLQBfTJHB+zmd6sN88qVHeFDPnDqMwN7/pW0nUkF rs+Q== X-Forwarded-Encrypted: i=1; AHgh+RrIMTPgVTatgWu1PHc+tYQLFQmdCzl5BbpFo0DyDuKIe2Fq9LX3UHFyMpzRRRmKj/keuUhy70GwLlAdZ9U=@vger.kernel.org X-Gm-Message-State: AOJu0YyTEjSEe/apryRkGi7+qVEYR9WGfYspMwngHdLH5MbGY+PorTC4 X03wZd6KbNj/2AU+Ifo005bwuTiSjkTjiQJqaOguTiORjUcNekrevbEetC+aVA== X-Gm-Gg: AfdE7cm3rTIRnN6WOfoZCI1NYCuMG4KJS1NK9WYl5DDZv9xmPbZmb0EaoZoLCsR+FjA nKy+wSEiktK6aj1Bi+YQR2TyS0J5wt0t/oNJqxfOsDra/VDVUCCDRJEYbGUprrNSA+fYoWelkm/ p2lBBgfDuvYhxEGb25lth2mLpqDko1F2B9XquyJJavG0Sy9zgbOzWyQNWeh503mcLuJosHGneJ9 UPQ1teSupqrMw/iZcOgtij4aAKXEPRNHX5LwJtm6W5ZgYJga3fvbHSA63UfJrF0rKiR5uP7uYEO fDTOi2SEyVWlytxsX9un743LjN7aIFhBCPcFvDDAJbGaZwrZTQNwwUAcJXgirO4tORY1sUqWNUg iDcK4RY0xvrZd7K/iVMiM9vswrmJcuPwA9QWTL67zyBwiiJZATpTMyWl/LVWMStvECSJV6RISIC 0UYwFDMp6VqhgLcwdO+MGt3HE3hEuAulx/wkGEphmAr1wk3XBt8DqKvNLyRw== X-Received: by 2002:a17:90b:2804:b0:36b:944b:fd81 with SMTP id 98e67ed59e1d1-37dfa1a522bmr5525074a91.4.1782454570910; Thu, 25 Jun 2026 23:16:10 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e12da6ec4sm302051a91.2.2026.06.25.23.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:16:10 -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, 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 20/24] ASoC: codecs: cs47l85: Use guard() for mutex locks Date: Fri, 26 Jun 2026 13:13:25 +0700 Message-ID: <20260626061329.23264-21-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260626061329.23264-1-phucduc.bui@gmail.com> References: <20260626061329.23264-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/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