From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 D0CED35DA5D for ; Fri, 3 Jul 2026 05:55:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058121; cv=none; b=rApAQv4p9z8mCwk4zMgtgQabghh5JCybALu4TZ7EXAs254BULdye8ESpq+q23s+TZwMJBN4Oai+pjahvLcV5k/anGz9YM7ADYqMCr8j48rKusW+oFd/odmrKpe36idNhXI+gHMbJYnnil7eQZIDaRTQcdZ+WmXZNByaDAQ1bnFc= 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=Z4w0Tu9s; arc=none smtp.client-ip=209.85.210.174 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="Z4w0Tu9s" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-847aa193d98so146779b3a.3 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=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=Hf6j86af5V0CMOW8UUCIPOBYEcGs8kFKB+l8jBsOWGA=; b=Z4w0Tu9svSMrkyXaW9+KU2lbAOvoJz0Fgfq2Wwp2NXAyKt167D8GZJXTF/vx49gYnM jsBWilVtE8E9QGSPO01Fkw7nn306vMjysEQeMddqOnSX/Vjm/JUV+C6G2H3cmNhoT4hJ OmgeLg9U/8c2K3XaWJ0pQplBgo5OuSh3yOBLpmlgIpfRIzBS4mMdf3SaCKGPpNEscuAp QuMSN8b8ynF67N5awyQG+pdNqzmopcAJ+c8kIlgv34E4NYYplgJu3Zy2rTfxrhxRgUZc U88jAOCOE2s5Ah4LTVVW5n5iRUnNsoIXln+N02W+3YW+2Bi8d9raUSS8N7xIUWMiYCkN kKhg== 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=lZmBtzaGzIuQxbH9uu04vrW3A6QaUzF+dJfOr7gkceAve+5QRZ8e53+iT7AlReSPf7 Um0aGl1dd0aX0KHankDoq5KwcXs8cnQ5Ye9s+MyqQ5PWWqd4r7naYtS1Zpts4H2ecTPh GE4h9JB8RlKaFtL+if8uIOI6OT1hujRObnLiq1vhv8jegYkx8sF88YjNoQAvoF3ZhdfZ cvM+IELCsY9xatSw9yzKBvRzCHYUDCpQiVkDqh8ar1rXJbW76jHBZPpP+CMWD7Kfm7GP gTsWwvD5vkx9VArcwqsfzIt0s32nGd7vK0XsRrXS/GoB/EzuvvIAe5woW0JpwN9GfREK bXlA== X-Forwarded-Encrypted: i=1; AFNElJ//DMEQrtsOEQXhfzWWnq0ZQpYKADomVGwASjpQpl1xCQ9rVQrlaQNTHqvpoiJK7G4WVde+WA==@lists.linux.dev X-Gm-Message-State: AOJu0Yxz+jMYkwbvRLcCbeZKiUn44RZP94iyMtNB6/2VCw36PO4WSwnx VjUzp+HxGq9Ii2zQmP6DXidHN18cmpgjotXQ4MjOM9BkuOYAynFq2tWe X-Gm-Gg: AfdE7cmx3Npoqqkhvg9WjkLBym4uUq1mOw/V2sz/oC92BKxj2KKeh7kWyuyvG34Mt+1 u3KnIUNVdAj5RJtV5kfS3jFHlfFCHLyCYfOfExxgP2i1wINNO0IdjyDfByLhPGZD67PlHXkqFnj xeHj0afGLpmT/fuZEl2HZMlKAy1AvwU9zwBMLRvbzQrWjcoohMlIJh3BHOZwW9y9qcelkm7R974 w0vs9+xUB1eQkSHk6BkilYXOW4vTMBvZPlLpDeG+u7L5GleU7x5rJAnsMbvswZmyzWz43RjZ7Pn uyIeX27OGGAGMiYw5i2TvPYczjMOSI1QY/Hs6trSaHVfsDE5RdG60is8HD4IVPNhQ8kZTD9XE0x +gkSLE7WpFU9Jh0vDVv9gGp2t327US01La4siUgSPpj4QPDFKD/OTkdN6z95DZ+YRAzYTCd5fA8 x0wl0X9nj+kBZMJcICKhqNb3phZYDBJ0drm8/pV0oH3RYkECk= 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: 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. 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