From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 6AF5739C015 for ; Thu, 23 Jul 2026 04:55:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782562; cv=none; b=Sx2F20kGYMIn/35Wg4oIi7OONDRVOa9Erb7TOvfKRD3JNcxGkxHeJOlaG/fqBGCDlOvWxi5+vKj2l9dXJO4ly621PHCNkfWCsSlMW+xEMd89MCMIsSTwtCvtOn8Aiu0nyKs6UQMFKLlOlS2ke8sZo8KxEd9RH9JLN4lyR6DWjbU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782562; c=relaxed/simple; bh=0NQREOEMSYxL+uqmZetrbuR2obu3D+rDbZ0Tzl7F/ww=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFcYxNX7kF08NNOjuhE5ZQl2vOSVctCm362ZLS4VbZud9SL9n+ge9izN+mUo15VLP3pDrS3l4yhr89i0UACrY2DqnsRzReBnJ9mzZeSBs5DkmfsNpm3kh1lLyO+KCOzclcRcDy1ftCTgGtz+2TIzi+M6X8kI5n034TDtkNLdNbY= 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=MeqWN546; arc=none smtp.client-ip=209.85.214.180 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="MeqWN546" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2cc73e322dbso2566005ad.1 for ; Wed, 22 Jul 2026 21:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782551; x=1785387351; 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:content-type; bh=usuTvoafYBlbhhxqvq4Yu+6sk7iPhWUYa3m7RcyQB+A=; b=MeqWN5461Hovsh0kK2FQo2ywpJcsdeuv7jo/AxVb4NmRpel7uWwaBRfdLGGgY8kHHd QVwBeT91y8oK9hB1HdswaXO1kOskbStYh+KfYFcaedBbVGc3H9a13JeYS4bP7bv+pFwT hbC6JG3K1HVlnBd3uwx68snhAETqqfpDUzg5HujTxK2d5jaUfp6WTGGEo/GErFA0gsFq ASJ1FPealodJnQ2Ck0poznGIt0FYxfv9xPVKyFL2lT0R8qkaNDQDM+UNTPc+2pOdvEqs fhcLYQ45giC/u94Y1uWT6JAvk8mW8sGFReg1s/ODrZmQVs/Qs3Vc+tgGPihIJLdnoiey vDbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782551; x=1785387351; 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:content-type; bh=usuTvoafYBlbhhxqvq4Yu+6sk7iPhWUYa3m7RcyQB+A=; b=Yua8/iO50vydmLySfJ7JdUisHP7AZl4La9GfdCxw2HybRENOb8gxMGZye/ZTAYE/vD JEIAugVcGTjPCXXw57mcrEsEa/E4GhQ9in100J4kPVmhK93UAURxyGe5s1lE/zyzUdo0 e8xeNz80N00VHnOIPQN9uF2WMW3Ok1d+WHnnb2ZcBkOUqug9IzRPGfWbQb3pAez8DXcV uSt8O8LxXdD/NZVUDI9VOjxdecHzdFnkAMnesfV800tmDCEbQ2CjUyQmBzZ0qk1+hFuf ccr2aR3IxB6m2yaQhOBIa4KQ47kN2270IxMXapqg/xCxWQpLAFFUlJsVmgz4oEUQrzAD P4MQ== X-Forwarded-Encrypted: i=1; AHgh+RopBK2cQ4AQBK6JaPbcFbFeg6RBRsN7fwL5wdzsEF3IRIpkdvzfgffQ5/zu+xmdiCqPBpGQdPkYCC9AF9o=@vger.kernel.org X-Gm-Message-State: AOJu0YzUNCOBekY1/01lB4rBWVdJasAIbuY/nxpPgW+N8AcVhbeZfdHg zuLvZqWHnGH71X8Zabq1PXwC5qP0IoJK1ZSaPAUusNrgeV2/t5Ip7aSP X-Gm-Gg: AR+sD12G1EEehZDjYEwSHKvXuGXj0yBekQtu/qp/UiYmCvaGxQ378U/4gFfqdx82M2K uVMQdYOu/wPOqum2M98X5Sge/nzgW3YBxMYqgvQ3cVURn0BDArfAsd4CBn/dzsWBmG4SrWJR9KP j6boEaZihEURPW7/Oklpd/KPa2nDJ4WREaY4vQtVIc2Kbde0xuUpOD4HFOQF5wVmkJ6+THJhIxX xaSsiq1QKDe9DT91E74bnI4andAhc08/7r5ZsMQS2vGuE8SaonY0YlxZkM5LTow6TU05uQyydwk PRxZzuWRSQrXNLJv3EUzA3eTay6iYlHrQ0cxpDWe55z3rW4hWbtK0O57xaYkRy2/iiVEo4R8PLY dhNxlGAnxp5mcSoTS4104DKkrXWFga5we4naUftT+/xqcEgMeKbPbNiZfWWUXne+edLZL7vZdMm ROpRg8Qg64O/r2cRMwSLFSjhk2zhcXLFu9G2Mb5zvm+ILlf3Q= X-Received: by 2002:a17:903:2441:b0:2cc:741a:ff33 with SMTP id d9443c01a7336-2cfa6f97144mr20581805ad.43.1784782550964; Wed, 22 Jul 2026 21:55:50 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:55:50 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Lars-Peter Clausen , nuno.sa@analog.com, Shenghao Ding , Kevin Lu Cc: Baojun Xu , Sen Wang , Steven Eckhoff , Srinivas Kandagatla , Kuninori Morimoto , Charles Keepax , Linus Walleij , u.kleine-koenig@baylibre.com, Thorsten Blum , Kees Cook , Chen Ni , Bartosz Golaszewski , Shengjiu Wang , Sebastian Krzyszkowiak , Pengpeng Hou , Richard Fitzgerald , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, bui duc phuc Subject: [PATCH 16/26] ASoC: codecs: wm0010: Use guard() for mutex & spin locks Date: Thu, 23 Jul 2026 11:53:17 +0700 Message-ID: <20260723045327.28260-17-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723045327.28260-1-phucduc.bui@gmail.com> References: <20260723045327.28260-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 & spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/wm0010.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 2a8c61a72c17..58c0c601ee6c 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -9,6 +9,7 @@ * Scott Ling */ +#include #include #include #include @@ -148,13 +149,11 @@ static const char *wm0010_state_to_str(enum wm0010_state state) static void wm0010_halt(struct snd_soc_component *component) { struct wm0010_priv *wm0010 = snd_soc_component_get_drvdata(component); - unsigned long flags; enum wm0010_state state; /* Fetch the wm0010 state */ - spin_lock_irqsave(&wm0010->irq_lock, flags); - state = wm0010->state; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + state = wm0010->state; switch (state) { case WM0010_POWER_OFF: @@ -173,9 +172,8 @@ static void wm0010_halt(struct snd_soc_component *component) break; } - spin_lock_irqsave(&wm0010->irq_lock, flags); - wm0010->state = WM0010_POWER_OFF; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + wm0010->state = WM0010_POWER_OFF; } struct wm0010_boot_xfer { @@ -190,11 +188,9 @@ struct wm0010_boot_xfer { static void wm0010_mark_boot_failure(struct wm0010_priv *wm0010) { enum wm0010_state state; - unsigned long flags; - spin_lock_irqsave(&wm0010->irq_lock, flags); - state = wm0010->state; - spin_unlock_irqrestore(&wm0010->irq_lock, flags); + scoped_guard(spinlock_irqsave, &wm0010->irq_lock) + state = wm0010->state; dev_err(wm0010->dev, "Failed to transition from `%s' state to `%s' state\n", wm0010_state_to_str(state), wm0010_state_to_str(state + 1)); @@ -734,9 +730,8 @@ static int wm0010_set_bias_level(struct snd_soc_component *component, break; case SND_SOC_BIAS_STANDBY: if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_PREPARE) { - mutex_lock(&wm0010->lock); - wm0010_halt(component); - mutex_unlock(&wm0010->lock); + scoped_guard(mutex, &wm0010->lock) + wm0010_halt(component); } break; case SND_SOC_BIAS_OFF: @@ -832,9 +827,8 @@ static irqreturn_t wm0010_irq(int irq, void *data) case WM0010_OUT_OF_RESET: case WM0010_BOOTROM: case WM0010_STAGE2: - spin_lock(&wm0010->irq_lock); - complete(&wm0010->boot_completion); - spin_unlock(&wm0010->irq_lock); + scoped_guard(spinlock, &wm0010->irq_lock) + complete(&wm0010->boot_completion); return IRQ_HANDLED; default: return IRQ_NONE; -- 2.43.0