From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 D32933D25A2 for ; Fri, 26 Jun 2026 06:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454468; cv=none; b=d4HonZXFUS904GK7Nlw8t8Okpk4ScPh8H03WtfcgORYU5DxWVZJGBLoe4/D1KxT/7XwpiIKtYW9ygjWp6InpuBfKTIFCHsCDpgPoiv8ME6+TSce6R3iuS2gp1fh3zOKiErjuC92FJmZBmLpTFW0wbJpZ6+oPFkzZagetAw2e084= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454468; c=relaxed/simple; bh=gtrP2bW1SWH+Wdjb3rDwdmnkXnip6p0Q8/DaEBD+ccs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IrLiau8JVcgsv6OYKpHPUofWWjDm8HtLoRSk9MnBuMtnLDXGv76KiS9baDok69wupYOP15uEoCqebXmBirSUBQkqYH1Ph0QdIJfEwHth4jv3vG2GjIgMAD+tjixiKHqpnVLZoJmpPoUZD/aVvk50FwOBP/o8LmwyNUHOBq6El4M= 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=IcV1hN/f; arc=none smtp.client-ip=209.85.216.53 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="IcV1hN/f" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-37d55e8d3e3so320592a91.0 for ; Thu, 25 Jun 2026 23:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454466; x=1783059266; 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=IcV1hN/f2bWHtaEzn3Ro/DSo/A3AsD7W3AIzDnE3GCYFINzkPhj/SGfDStzZpDsm4Z aGjBRzX7UUgfYI03OKXZT2VKAawsP39bcm0jhFgWeQxG9JXvKpBqtQUz0iqD2uidnVKD 5pkiD6KVvRZs60uAoSdXdceo1Wl2OT3VtKbEkVvJ+lFupwRbPgF80DVXc7uZfErdtzQs /5T+G2/HP8jEfnSV9Oprw3aNeBqLxnShMDdhrbpeWKqkCDS4/gLZQ2g/IK+CA6jlwuqr Edd6bctQFKboZfWnXpLEMnRyzcxNyDi64gQ7xZJ6T+oruck1oTPEoy+KLSTFo6lVFxV2 A2sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454466; x=1783059266; 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=meN+l+l3lDnNVhtn0aY8iOTGRhvo7jm8wQhQKDdZe0370Id960FcuHgOOR/zNOty48 xxC/+6tU5AP4w8ORkPaDYaMErDCQLv6r0xXKg9sY9I46eBkxtyHL0Dusl4iwXnCf6jgK KhBB2VIZGefFTitAk+K/Y1jnux4Kkg+WZJb9XOqCOFvZEeTGQrCfYhV4JjJpCiT7ZP/D 9R8gWWqqtPbM2Cxwh/UsYkAwOyzaAAwTWWZ7J16oVKQvjX34m/B0kNJcjsSnnSloqx/3 GTkwtenmi8536mOITnY2S9vSVgiXSnaarC5fP9+gj2KnlVpkhsYCXo9zbmba3faGPExo tjSQ== X-Forwarded-Encrypted: i=1; AHgh+RrSvs3JLBgqhOlFbGs4kdx5Rq3v7wi6hU/wYxCy0FyMXNxBCe5XmgNdQiVaRlNCShc4k2vMqnGmlAB7Enk=@vger.kernel.org X-Gm-Message-State: AOJu0YzzLEFHR6K54Mvz2M48XXdACnd0gV3Q0dZCbFxNTA4v4O+rTIEe DR1ZPbsSt2RELHNeI7WkNYUo+sr4NCKDL/qbvBXr0qdn+W/Zq20zfkFo X-Gm-Gg: AfdE7cnfkAVvQ4Zy0F6FgVSvvwB7d9yLqL0ZjFlPaaw352F033IUlS/LkPWQs8nCa2x RXi7k5DCjKo9cV7ylJJRknfVEHN5FfN4LkjfMAp0oVGXGziKDYHgS7Ffwb4VvOez5Jky59zfSqh t+oXCZJ2fI+pv51tU+hsjRsQqjUH3yYW09EaFiwxj+0hPysZNWFTK9OtKlqd5OkCiutpf/kpjX4 V94wMPyjAzJPvYz+bKFVI8Gh7WuYkXC1U16j4kpD1dCic2MbyOvuY9hQQWZ68eRkfm4GoG633Tw oAm4CCkDQ+aCGLHiMWITzSUjfIEBRvkkBxu7rKwqidG49hCkolHEUAlG319F8G4PBSEn/PtV/ZO 13zYhSH6G93GXkOxTjHxwyBUkXEDfaHy23HCIiTbMz42GHX4UyK9ySo5wjzhqu9EOm2zNMgBIYD onvctsFRNr9QvVltOMCel26sVwKV9H1BmCB7oEXpOQ+7ihyG0= X-Received: by 2002:a17:90b:1dc3:b0:36b:b903:994 with SMTP id 98e67ed59e1d1-37dcd66b178mr13297213a91.4.1782454466074; Thu, 25 Jun 2026 23:14:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e12da6ec4sm302051a91.2.2026.06.25.23.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:14:25 -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 07/24] ASoC: codecs: aw88166: Use guard() for mutex locks Date: Fri, 26 Jun 2026 13:13:12 +0700 Message-ID: <20260626061329.23264-8-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/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