From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 601ED3F44FC for ; Mon, 27 Jul 2026 09:44:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145454; cv=none; b=qwvLPWLSEYP6/NKXDatSw7qVh+nPB7gYSTDEDFKs9j34GL03N4YFj+rqt5ngmX+OldNFARIrG1L2218qbgSkJr+iqU6mwo+DJaX3tLpTJJ2DbFjqmil+58PWlFFKW5szJkp4mb6sqVn8l5odPKUj3Z+hFtdGmIxqjb0Ma7VS9G4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145454; c=relaxed/simple; bh=qK5oLqa99LwEbJPzMKlzORfyTf5bRebbJlbRHy6TwSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OKnzzto8jehxYlA7BEghjKwGgcb7NQRHI+8a6pkRJe+RkYP7mu//rfMTdXmK/aYYUyszb3ghAga0RVAymZzMh9JFr3+ifSP2xGQflDLwOfWepCN0qwnGO/y1/EP5ygKs3lX1S7NLjqur3AdO8gEyc3TRgj+eFMBOtMLisLbUzSA= 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=dCMwVdUJ; arc=none smtp.client-ip=209.85.210.169 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="dCMwVdUJ" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-8487088510aso2016811b3a.0 for ; Mon, 27 Jul 2026 02:44:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145452; x=1785750252; 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=TeHMMHG26wLFUe8JtsiyvcDWtHIXZd7QcS7ThdQpwx8=; b=dCMwVdUJxbbExkqYdhecBEZWEuMQcxCk2b/ArKOlxhJ7P4t6GEqLu1WCF9Th+w47y8 FQADeq7U4dbf259Cdcx8qDsw6CquTHBddXzcTMZsSNHLYIZidpj32AFBtFXLiabTPlog 8r65GNs9OCDVOLI09bzM3C4q2yoocF5ylwnenhWqY4CMfcn17sWiT278Ngnc/lowYq3I zb0KCyZpEGfLm0VlMxo6tkmnzrvByDIjFvcKcX/9t4PapZ9MOXHWtjjBLlMT+1VpsbWm +2NNWHDhuAeaWWbs3gn4GSdXLIgLi6N7rsZ5gsrN5OfWM3VISH9j5g+INlJEhAMZWNWz q5Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145452; x=1785750252; 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=TeHMMHG26wLFUe8JtsiyvcDWtHIXZd7QcS7ThdQpwx8=; b=AsUhmAjXEtG6dcft0jj0L+rcLHV8ogcJiIMTBtydkZbyzsmgOy6WJwj4RU4ZS8r3ne 1hK/2XD0i4jWY6m42dd73jwGnWWDXxSM+fHnxa6KxA/jtm1TG98mC9SQ1NJEXKYLXxB8 0vQ0HG3RIgIf91rg5HaC/RjlAnyYyvEgxZGzwJdRknsT7yz/Qy86Vcv1ISYXRmSgTMAv gyBNlzZ5MkCea9fMUKCEyiICnvZU7f+r9EDR8yxiKMuBQ2IugnMbJfgofu44A1UVTyKX +b1grIsTv5FEAIgsXQsCmSNxlS/uJ3CSSMZD+JbQlDz2EhGDe0DKVnAGKggOqY4jRODj 51vA== X-Forwarded-Encrypted: i=1; AHgh+RrhR8Vv5sSHFYBW3i8uLzMhJGiWcixfVQy2kKL59F7vMusgOzq3D4QOVc7AHEW33UP8zvgi/kxk4V+4P2BH@vger.kernel.org X-Gm-Message-State: AOJu0Yzu4BICtTnLyQ4r1V2UiXEiDPHutNZzGpqrgswnUzq+jYVXIBeu L/kRp7/l207zL7NG81Zwz1Apb8rHyh0Kul3OID9tF5IB8IMz2od2BxWH X-Gm-Gg: AR+sD13QnaDC+zVOFwiIlbamIMUGgtpKWxAJUbMDoM5pXKNe87pu1WodAkk2bSR59h+ 95EOH/gqGwvGV5SK5VQERQwDiBPlViSdvoe9ZYbQCp8pNjL7lNqDnf/bIZczKuRzHjsUUUYmfHp DFgus48goqMHRDary0G22obOG6Y/W7OcZLSQUSq5h1tkpqWxn/5kxNuL1thOwOzeUqhJ8zr9i1D iXAhamyuNCIktKN8XMWiNPOn1d2cb6if/DXooU7K72V5payvkEhYJRf/fGB7qVTqqT08aKHN2BI vGNaKGx6mLkZYgEZ2GwQyLulYOWSV+oaj/RA0l5TNQAvk8Xi45lFIVoOhmNSOAg0cLXxkLyw0p3 R/F6KmFnb16BqP4v2kvQMd/hvcNtWTXr801BxIa6aEunJ2PUHN0iNEFinwXwznjCNBjbVwBLsRu A6WJIZwxksMBkygH0x28EkpUp4WAcd1X+OhDTQ5l2I9LI6/xW4yFViWJrIRLgNbd52faqDoCoMC ZCE8IWCWzwaDfdWsgihMA== X-Received: by 2002:a05:6a20:6a27:b0:3c0:9c1a:893c with SMTP id adf61e73a8af0-3c67e16412fmr7411564637.68.1785145452602; Mon, 27 Jul 2026 02:44:12 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:44:12 -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 v2 16/26] ASoC: codecs: wm0010: Use guard() for mutex & spin locks Date: Mon, 27 Jul 2026 16:40:36 +0700 Message-ID: <20260727094046.23001-17-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260727094046.23001-1-phucduc.bui@gmail.com> References: <20260727094046.23001-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@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. Reviewed-by: Richard Fitzgerald 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