From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 AE630356749 for ; Fri, 3 Jul 2026 05:55:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058121; cv=none; b=p61RG0yR1/29tiwKqJJc4sh+qA1OrY/QoqGySOoqG3XatxrGzXiaDZDKXgoeNZe3bM10y67c0cRMjcI9V5tDBxxuloGNDty643YKzMmaA8AkCv0sXr3sTiBtrs9DN5xwLuJ4Wu3INDC2gBTB50MWf/gdUkOsVBvVCVKe0u3J+t0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058121; c=relaxed/simple; bh=gtrP2bW1SWH+Wdjb3rDwdmnkXnip6p0Q8/DaEBD+ccs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o9/0fEqIFzaTBnsZjhXF/vm7dl6gKOzok1qxla+ljXbtyNgZXaS2DFzj9bp9W4Y2W+GrYwfUIxj6EaZANIgNgKTCQUnmNK77+LoljfOFn0a3eQetNlFaNyWzHdC9oebQDHd70npi6HhBJM+w+lofs3jj8rmUEHDq6CffaicJJjg= 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=DouVHL9T; arc=none smtp.client-ip=209.85.210.175 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="DouVHL9T" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-845ea8924a2so171340b3a.1 for ; Thu, 02 Jul 2026 22:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783058119; x=1783662919; 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=Hf6j86af5V0CMOW8UUCIPOBYEcGs8kFKB+l8jBsOWGA=; b=DouVHL9TNESySGCjZj7e65zYjDSqU4yth4bwbq/bOzc4UkX6UrUiwej2Gq70z4BpbO LSULjB9jBzukN4G//NyGbPzVfrTk9nxXUH5Ktx5oNKapxvO9UyqpKTCxvOpBIf7UuftP CoGCseS9c4YKhHEKJlfn6nhOus4A0WuxQXgQXy7h55LcaIGiVfQKSwyFmnblSU096l31 dQrf3LFsAvc8UpErDHvy6PESTNDJhLSqVbgBXt5P8OJNp5FXNPJAs9nEstkBUS1+GPFO gYDpbxJkN+1Yvl0PzlA3g91CUCn842Ue8pzPCb7JEvBu7bXFyKUNm3jJIcmMmrsMJvAA UvUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783058119; x=1783662919; 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=Hf6j86af5V0CMOW8UUCIPOBYEcGs8kFKB+l8jBsOWGA=; b=liKMQGwCG/sN4ptGWSy/eLcaJP+tgH7jIP9bO1I5TGff1RgV5OJ55Z+VKUWlktwBxU qbtYANO/1VtVK1b/w2mnnOu1+Ta+zRq4sVeKHsvL2HR6vqIO/GvdK2M3V3rSpa6g8oLe HhpkMDwxhRfQWqn+gYhCLEpFqB+pc4sUk6HsiHzwyoMpIzB3k4eKsc48m3IYXTLNAU6i a7EQJYMnGS7wGe/4bgsYWdInhHffS7aYr6vt4qXgzk2tBwLWrTZ3MJh6Z9N0KYlFhhum 33jxmtH3gcMzt05O4cIQllBCso95KvS1LyCPnKs5MUxqgGsLN3b6v4dxmEjMZ9OxYygq h1Zg== X-Forwarded-Encrypted: i=1; AFNElJ/mvl4SsX5o34p1YEH0MiSULpUh7qur1xwtNfyqEczC++C09fevI9uZH3KHB0mOX++9qIglsg5NFyB0QJA=@vger.kernel.org X-Gm-Message-State: AOJu0YylKD3Pug3l1mPnubO1bshkaVm2PjeTPaNV84lYyGUM39WEka12 fZyqMdHX3gWHuf+zOWykqbfnDwwHc+0IlRoiaawKI6+SFBe7IsKVDSpj X-Gm-Gg: AfdE7cl8sUWWc648ZZZso+s4UclLimu0Z8bgbFVTL5fX0r0Arw325XKnaZo+tP7e2Io OoUgsb7bONOSoLCJoaM7doxvh/2dOakoe3y8sZI+KRpBeYKtICkEBtOqLYQudHcG+ToNsJ+fE5l WiVijbMPFQ1DWeqVi+TmmpYfgTO7xTEvcjlHvqDFpMJhFP6ZK8kNvTZ99k7G5WP1hvD8ZRQ55lX bMjukU89VmXbtdGsw2Ho3CQTu9+oe4NNaUlNwodAiDAK6McSO+LQ6d7rGbqEMQN9FdGICHfYslh SBzZkbbWLpOEq8HS3ReDfuz/yEGnQvZ7HAk23emQISZmCnIjko4mhcq47ncb96J/gR4kbyLmWTm POVcTRbFg5OtmGbwoG6vYjcwoZyX2ASRDyRq6mhyeTfOA7Lwt21A+ONSoVdbNEJphtIGewG3zW9 Ar1NVNg+pS7nseH+o9LssnPfANnAKeXRcFrcsm4pxNMK3FyXI= X-Received: by 2002:a05:6a00:992:b0:835:405a:7e72 with SMTP id d2e1a72fcca58-847c0690f7dmr9121802b3a.11.1783058118814; Thu, 02 Jul 2026 22:55:18 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847cb94b3e6sm2340028b3a.33.2026.07.02.22.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 22:55:18 -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 07/24] ASoC: codecs: aw88166: Use guard() for mutex locks Date: Fri, 3 Jul 2026 12:53:38 +0700 Message-ID: <20260703055355.244898-8-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 --- sound/soc/codecs/aw88166.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/aw88166.c b/sound/soc/codecs/aw88166.c index 3f15f4ac51f7..b72f87f677dd 100644 --- a/sound/soc/codecs/aw88166.c +++ b/sound/soc/codecs/aw88166.c @@ -7,6 +7,7 @@ // Author: Weidong Wang // +#include #include #include #include @@ -1173,9 +1174,8 @@ static void aw88166_startup_work(struct work_struct *work) struct aw88166 *aw88166 = container_of(work, struct aw88166, start_work.work); - mutex_lock(&aw88166->lock); + guard(mutex)(&aw88166->lock); aw88166_start_pa(aw88166); - mutex_unlock(&aw88166->lock); } static void aw88166_start(struct aw88166 *aw88166, bool sync_start) @@ -1413,11 +1413,10 @@ static int aw88166_profile_set(struct snd_kcontrol *kcontrol, struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec); int ret; - mutex_lock(&aw88166->lock); + guard(mutex)(&aw88166->lock); ret = aw88166_dev_set_profile_index(aw88166->aw_pa, ucontrol->value.integer.value[0]); if (ret) { dev_dbg(codec->dev, "profile index does not change"); - mutex_unlock(&aw88166->lock); return 0; } @@ -1426,8 +1425,6 @@ static int aw88166_profile_set(struct snd_kcontrol *kcontrol, aw88166_start(aw88166, AW88166_SYNC_START); } - mutex_unlock(&aw88166->lock); - return 1; } @@ -1607,12 +1604,12 @@ static int aw88166_request_firmware_file(struct aw88166 *aw88166) return ret; } - mutex_lock(&aw88166->lock); - /* aw device init */ - ret = aw88166_dev_init(aw88166, aw88166->aw_cfg); - if (ret) - dev_err(aw88166->aw_pa->dev, "dev init failed\n"); - mutex_unlock(&aw88166->lock); + scoped_guard(mutex, &aw88166->lock) { + /* aw device init */ + ret = aw88166_dev_init(aw88166, aw88166->aw_cfg); + if (ret) + dev_err(aw88166->aw_pa->dev, "dev init failed\n"); + } return ret; } @@ -1639,7 +1636,7 @@ static int aw88166_playback_event(struct snd_soc_dapm_widget *w, struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct aw88166 *aw88166 = snd_soc_component_get_drvdata(component); - mutex_lock(&aw88166->lock); + guard(mutex)(&aw88166->lock); switch (event) { case SND_SOC_DAPM_PRE_PMU: aw88166_start(aw88166, AW88166_ASYNC_START); @@ -1650,7 +1647,6 @@ static int aw88166_playback_event(struct snd_soc_dapm_widget *w, default: break; } - mutex_unlock(&aw88166->lock); return 0; } -- 2.43.0