From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 DF957381E81 for ; Tue, 7 Jul 2026 05:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783401206; cv=none; b=W9coaR4jzxYOVzABbXfuTmjo9nOS7UZV9Pe6/hDKgTlqcB83m078+Gc9OHhMRi8yGDP0SMPQ+FUFndiSAG+0/X9jhmyDyzF7b7WM6+SgsvI5jasgfYlkXGRpg9lidm/I1wkOZVfs1IynzHcadGXbLAXwduHCQsc1jEo/NcdMfIc= 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=cX49UnUu; arc=none smtp.client-ip=209.85.210.179 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="cX49UnUu" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-845eb7b96feso3612050b3a.0 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=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=jI5pXZcspax/jy+Cb7T9z6bqjcP+qI/Rnmy9ZVRY4f4=; b=cX49UnUuZ/fEIyxfe14MCUNjiRrjdCS01jWAO7usVJoP3ZokBk8t/dP1q+mJcDMGQ1 hCDtexmep0tyrUXcfU+8+fPHssX9Pb+/uRiEJWxVHohcLb9c926P0DcNpqypqI6ckGsE bGHiPpOvfj1C71TsKQfXhmhNj3tJQSXVVtVGDAwbVEQuLqAchB0Kw7POAErcADqHW+uW j2IvfnHiH++O3iTiRzkM4+qiJQVQhdRQIUvKo/vPvIC19x4JdUt6Msqc6NiVkjTxob9P QA3jTtBIrmWFWm85kIu5yHdp1zP7fJN9cp/CZWZaPYvXRU2dRsszOgwkw34Qu7LIlJXV 4TGg== 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=mihcDuqeI+EJjfzD2or1j7EZQNZEGEj3tYYflrBJS/wIHCdpnYe9XARRZZZPigONnB BupErVPRP2S3FTk2KpdVQQ63v1xt7nVsME48/nuVRO5KxDEYVXkhvFnFfIQjzubfNJqO PsCaHokONDpyPUQ7wofXDnTENuEO3kpeebxF8Qz3g4iYgrE+NhxVhm3Iz5aVqqg5Misq RgI3B60bMOE+HPZg7mOoXqB0x1JeHh3ZqhMirmCSw8GooqTjWT/113cCcb8BKMMzg0tI Ua3pSEETfSbxFT8xHmuOh0mgSooqtmrgtCNN6QwFXfAmz+YobfSodx0G+iChQvyuIPTs u0xQ== X-Forwarded-Encrypted: i=1; AHgh+RoZNntCa/wcM/oc+AvAa6F9TeEk5k8nsQME1Mm+kKyJqi/ZWKaOMhIUE2hBVSZQSIr2ln82fdX2Fq0gcMw=@vger.kernel.org X-Gm-Message-State: AOJu0YzQCwmK9nraz6iWT7X9/csFr53YTINsye34Favy6pV9o5aWt6wz SdIoj5XEgLB/lmmKSPDp3anbRJNoFc7n2oh4P+XfbegsJa8TglLS+Ox2 X-Gm-Gg: AfdE7ckuwuJfuvHDjxn7p2jxKpnLLwjuVUMJ1VdVVRJsM63M1/NfEkpQImbT1dt/y6G mF/sAb6gsSRarc6cm9atajUaqezXG/EwsBDrIOTvxnMB4cw1srSj8e8HTacMnZbRQ/DN8MdJAuQ xqkJd44tD/8e1YStYgVb78SAWGrskXJ43OOwkAJJQa+kWC3Xbb2U9b/7SVFDo/V9abs2wCx45pn O/PB8qRCpfgxDMRrsUglLjhiPHx8J2Q80d5t/FT4pJLjsli7Mweg43R7Bqtm5UB9ADhMlwHniwK xnXreq/F+FWkzpga44ZMuP6io04sywsvyF4fR4ircTOKBaFw1kwcbzpDakxrHUM1IP4qafpJlfO pz1Vl1AP5wlg6j3KH/ZvvwaeFtJEn8EYvOMDZ2vRtVJC7L86D9Wb4Mrgy2oyArhHKayFH7fBYTh IsM1aYuWqmOv/3HIk6j9+uo/HU/0cvATIT4LG18VecZHEqqyRVtKFP+J4kLA== 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: 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 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