From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 CC030381B10 for ; Tue, 7 Jul 2026 05:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401206; cv=none; b=ujQbCPAb52yzVVfWIIwOxh0DDjB7fqeIOhYo7qZbe7F6dPK1VvEUGc8FOkuY6q12xsesZ87wIQWE/zjre0jMgERspXGxf0gtmuGEiJpFzStRNhSlykU5UCT290LuQrGzbq2AsV8D54IMdQhSWtYLISK6CMKpRmE8Mlfx+aZ/Cl0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401206; c=relaxed/simple; bh=+3hlNotW4UMV0IZGCNdumn4+B3/jOqBkQsLXMj3bIIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uRn/dk3UUKY03tPQKzEQtmRdOwp5FK7gLmL+rkOsmlKOUZnhqs7omGmPPPoyjPxzV81DM40nI1xr82TVUKoIeLhSlQsaNZ+Xkat5btNYdqE74ISbxorFgMr5KFE5MCCvUikdTqbjHg8olTqMZNMzzam+MHsoILn8sgN4/iendJI= 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=fGeH0NtE; arc=none smtp.client-ip=209.85.210.169 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="fGeH0NtE" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-847d1e9db22so4108650b3a.2 for ; Mon, 06 Jul 2026 22:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783401204; x=1784006004; darn=lists.linux.dev; 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=jI5pXZcspax/jy+Cb7T9z6bqjcP+qI/Rnmy9ZVRY4f4=; b=fGeH0NtEQ09Wu3D/pCvoZwkDo9hPCUwTSgf2Y+v9FZTRMWZwhjO+ODz9JspZd6GBt9 46oVhpdikt16KkEng3mKnZhHc42BlfW9msxyE4HrVWsW3k536LGzWhBXHNC7gKJn0dha vs8Lz0L4Mvqd0RImLYWM+RoHYhn8epGR5SIZWGK5X2EQO1FvV55RpHIJC77Sx7Nh9C3K BvABlVw8OKCMcJwLCW1sWXJMAniv3Acn4mB+RtM3f0Z11eWwozSBpPMHD0QRlr6py157 fLOMPQ2/LXLQRqCmwlzj5Pqfwq2IlkjeKI4qeaGBzt7iR0DWQz9teG84H7qP62fG3I9y R50w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783401204; x=1784006004; 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=jI5pXZcspax/jy+Cb7T9z6bqjcP+qI/Rnmy9ZVRY4f4=; b=hUNHxCPCa8RLxj32K6erk/eJcpod80LGoMs7y1GL27irtATBZO2nWN/qeDaSZ6N2Ws naU4x2VCxlBc/y8z1qJhXoYbhFWpPYrTkjuKreeyys0PoNzlquhFGp2BEcDj8y1wSbS/ /1IIxJWk3855Ofg28xVTaFWIHHhbV6Gyjvi2LUIAnG4gSEARKgfhgNonnz5Y/8WCvPW4 eFXTHZdc9DiS6vQIG/uCyUNqGZpzOsDRzHWwG1KkRx3oOEB4x++cdmQwrxc41VPuwSbV lykjYzXIL2YZaTybQXEU3ZAXITvyTqgG2aocY91at0lQzwd+Xor44q8WrQ4oZR3kFmgQ qmGA== X-Forwarded-Encrypted: i=1; AHgh+RptjzobsKbgIjhsLo9abjIXSv/fuelVsRYW+iAk9P8h2EN/Q03ZukqiuP6D39iYNPtP4UU+MA==@lists.linux.dev X-Gm-Message-State: AOJu0YxpP8mK6s2sRVV6z5WAFqOpQ3OKuLqhVK6/7FcE+o6vR3OD/3Gc UVaqZNwLx7H++qwcSQFBRrpPUqiHIfkCeeNG4XMS7NQHHxhj2R7kJEl/ X-Gm-Gg: AfdE7cnx9Nt197MkyJqEaHgpLNgSE8Q4zD88zZYMvrIy5FAOuRRxX6Am5hfPxwtq9oq rae/gn99onyxAOMd+RHTE7qPW3+62lV3DucpKi5V5sD9ORwyVj3I9lRq9LrPpuJWBw6R60zDuUc sIP+B8211b8cLC9KXCghG3z2kuMT/+aUPUEZbhreKheaX0UpwXWEePMyCSz1pJRuP8hmzHAa89y Ktu3YGqztKUOnSqxhn6110t+peFssBBpLnvLHe6IdhZJ/q/xkeubAQy1VWSIpCFUpm+26rB8jRy OsNeb4GBiNoYTNXgnDRyUYKACO2+aE6AKdNfTE6kgUJ/SudW/4+FeMF0b9iXDE/0KbECyoV7YXr igLDhLIzEBK5SM2g++bGhX12p4AuRO1viFJfRx+RYUE2jI3wUzcXVl0xcLx4OZMl0r8JxgofjAz ltcURYLBz50XyOBsI5efG7wRrYJx/EV8JThZoCaA7YZaWfLWOiXOZjH+K9SQ== X-Received: by 2002:a05:6a00:9a7:b0:847:99bb:b6d8 with SMTP id d2e1a72fcca58-84826c33343mr3645283b3a.26.1783401204131; Mon, 06 Jul 2026 22:13:24 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d4dbdesm4728495b3a.31.2026.07.06.22.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 22:13:23 -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 17/24] ASoC: codecs: cs43130: Use guard() for mutex locks Date: Tue, 7 Jul 2026 12:09:59 +0700 Message-ID: <20260707051006.20058-18-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: asahi@lists.linux.dev 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 Signed-off-by: bui duc phuc --- sound/soc/codecs/cs43130.c | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c index e7b06f962790..48d88dad4ceb 100644 --- a/sound/soc/codecs/cs43130.c +++ b/sound/soc/codecs/cs43130.c @@ -6,6 +6,7 @@ * * Authors: Li Xu */ +#include #include #include #include @@ -818,26 +819,26 @@ static int cs43130_dsd_hw_params(struct snd_pcm_substream *substream, unsigned int required_clk; u8 dsd_speed; - mutex_lock(&cs43130->clk_mutex); - if (!cs43130->clk_req) { - /* no DAI is currently using clk */ - if (!(CS43130_MCLK_22M % params_rate(params))) - required_clk = CS43130_MCLK_22M; - else - required_clk = CS43130_MCLK_24M; + scoped_guard(mutex, &cs43130->clk_mutex) { + if (!cs43130->clk_req) { + /* no DAI is currently using clk */ + if (!(CS43130_MCLK_22M % params_rate(params))) + required_clk = CS43130_MCLK_22M; + else + required_clk = CS43130_MCLK_24M; + + cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); + if (cs43130->pll_bypass) + cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); + else + cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + } - cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); - if (cs43130->pll_bypass) - cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); - else - cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + cs43130->clk_req++; + if (cs43130->clk_req == 2) + cs43130_pcm_dsd_mix(true, cs43130->regmap); } - cs43130->clk_req++; - if (cs43130->clk_req == 2) - cs43130_pcm_dsd_mix(true, cs43130->regmap); - mutex_unlock(&cs43130->clk_mutex); - switch (params_rate(params)) { case 176400: dsd_speed = 0; @@ -881,26 +882,26 @@ static int cs43130_hw_params(struct snd_pcm_substream *substream, unsigned int required_clk; u8 dsd_speed; - mutex_lock(&cs43130->clk_mutex); - if (!cs43130->clk_req) { - /* no DAI is currently using clk */ - if (!(CS43130_MCLK_22M % params_rate(params))) - required_clk = CS43130_MCLK_22M; - else - required_clk = CS43130_MCLK_24M; + scoped_guard(mutex, &cs43130->clk_mutex) { + if (!cs43130->clk_req) { + /* no DAI is currently using clk */ + if (!(CS43130_MCLK_22M % params_rate(params))) + required_clk = CS43130_MCLK_22M; + else + required_clk = CS43130_MCLK_24M; + + cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); + if (cs43130->pll_bypass) + cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); + else + cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + } - cs43130_set_pll(component, 0, 0, cs43130->mclk, required_clk); - if (cs43130->pll_bypass) - cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT); - else - cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL); + cs43130->clk_req++; + if (cs43130->clk_req == 2) + cs43130_pcm_dsd_mix(true, cs43130->regmap); } - cs43130->clk_req++; - if (cs43130->clk_req == 2) - cs43130_pcm_dsd_mix(true, cs43130->regmap); - mutex_unlock(&cs43130->clk_mutex); - switch (dai->id) { case CS43130_ASP_DOP_DAI: case CS43130_XSP_DOP_DAI: @@ -988,14 +989,13 @@ static int cs43130_hw_free(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component); - mutex_lock(&cs43130->clk_mutex); + guard(mutex)(&cs43130->clk_mutex); cs43130->clk_req--; if (!cs43130->clk_req) { /* no DAI is currently using clk */ cs43130_change_clksrc(component, CS43130_MCLK_SRC_RCO); cs43130_pcm_dsd_mix(false, cs43130->regmap); } - mutex_unlock(&cs43130->clk_mutex); return 0; } -- 2.43.0