From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 88990393DCD for ; Thu, 23 Jul 2026 04:56:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782617; cv=none; b=XoZqAVlCxLwdWDOG3jZVUk81Qsjrfbl82FHqwFPzgkt8/1j1ElXvQHMqcDZdOWMnayIxDtKXvPMUtEtAdQGPGrbBll4XORn2tzQiNoFhDk17XJ+XA/b6q2Z6xBL8DWQy35ne5ufEXrUmtu2pgrhnNr/DcrJQHBqYuxFaFHquggU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784782617; c=relaxed/simple; bh=Drn8APp5Uw6rYTgsK/ubGCbMdZovD7uDbrhOiuvrAPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hhO/JOmo4h0gdF/CVeZhcLI8rUX1HPmL0KhpUPPeIJk0CA2m9pMfv3ANQmjR5L4zU3jeSRAHUceIP8J2RQmdTbiZPC3JfriCm2muGWJshgvX9sx2HAJZs50ht6a3Qbs4gGiHc0nqtB3kTX8d8FY+uZw7BbTGpei7tJIL8kapgYE= 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=OYB6f3xe; arc=none smtp.client-ip=209.85.214.176 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="OYB6f3xe" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ceae1ed204so2230375ad.0 for ; Wed, 22 Jul 2026 21:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784782605; x=1785387405; 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=OeWw6h5jytB2MGM9QIlVlvrzPpa8kERJj1qhZ9lmXsU=; b=OYB6f3xeyetL56gcT6B9geaavkO1stAqR4SNgAiSUk4ai7kv1DnDEfRTl0i6Sngoc4 o85DtGRMj85KOwd/rIczizzXY9InE6CWm84OnCklxyDmATfJi04uNytG1XZznef3Glnt DmEvTk9tlrrJQyTBvoAHTaKagMNRkHAaVmnN/BdlJWccJZuFG4i1kZ+Otfgmv4Ur1FyD SVzAho1mFgs+ruxA2mkyi6Bidhvpr0Jk3pgrHEyNnKO2ilksWstUnSNF0DD9vc1i/FXb IA13GCtdudlMCvfb2S+c6T/utdKT+J3pXotcCNKmt/TB/AIS3jXZIFi+pC1k+7bybkng 7Jlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784782605; x=1785387405; 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=OeWw6h5jytB2MGM9QIlVlvrzPpa8kERJj1qhZ9lmXsU=; b=GiBsLckwsatHCbFnW55xYzLaxCMbDNxFm2HD07kvak/DdveLshYBXZ77J9u2uMOMag U8w4XFqLKvXcBW/tcs+XKqGNjqp6J9/0JuyBiERop0y8uwzI0kUBc3reJBNd4v+A2Cn3 CGS3XBviIUdhxUNJKvS0aIL8F3mdvaPcoXpOIXYd/zwD3w0XheWw062X1OVxwMyCCO6T QhEf4miR2+ctakG5JWhSZ7txkKX4ZBNc5zxmqT3m86AQOZFGhUqKgbrshyRjkC6xiIOR GkGVZxuVD/bGiGsBIz4170M+hC0C+c3ktZAHdX9yjxKZXRDTfeQ28dvUEfoH6QU8ohES Fp9Q== X-Forwarded-Encrypted: i=1; AHgh+Rqx4TxyZThNqyplk1HIKQDMBy22e+9Yw52iS71frteGtE4ZWezF32tjKpDtEQe08+rznGL+MIUnx3ANEJU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq5IVggLeJ72dgE5bud93afYxXH/Ec4sS4S2RsX7W/yXnAeRhY d8vCeosgEIgh5WMxwJAtkfRkP5ZLoTgYsRMcqPaAwHwNwWUA2di0awh/ X-Gm-Gg: AR+sD101vLZ3ekdacg3zGM0y/4ONqSqgj8pImwR7EVVsD09dLqJyvkaz0JQRVlbPljw 502g+oYeAiKcY2pYzozdb9YXECYJXWFKCewPDT2VzLAUWeDtRYpsfKE6kkODGqVHe1rMW2eQtM5 RtTEnLU7tMSZxjwBCm2DCECS+PLGQsa9am3VvfavsEGcSvhy+yoGyoNADSFEg4256lER9+ugH7+ PgWZrdy5Baxkp38uDM9Lpd9x43xjPvePOtS0oc0HrorAk18pFANElAyvwnVTiV8A3FBPNGCi7pg VoD6GImGvNPF7offNT3p83jf5GKS2ms80QEH+nGGKErY4msBnOlToa27N1jy0wv48fyyGTB1ULg O5+cbUmvbGeM5aUNcCWC12/PxAZTj6CnvDZA18TLjndi2EpLf7L5x0YUjDzITaDSmS4FMd6K+mh e0gE/t+KwX15m40KAYcwB3TK4fnFLyv1Ud51KH X-Received: by 2002:a17:902:d491:b0:2c2:62ee:5a0d with SMTP id d9443c01a7336-2cfa6b77547mr21829445ad.14.1784782604968; Wed, 22 Jul 2026 21:56:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfa57542e0sm7258365ad.67.2026.07.22.21.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 21:56:44 -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 24/26] ASoC: codecs: wm971x: Use guard() for mutex locks Date: Thu, 23 Jul 2026 11:53:25 +0700 Message-ID: <20260723045327.28260-25-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 locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/wm9712.c | 5 ++--- sound/soc/codecs/wm9713.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 83cd42fa0c28..3105b2e0556f 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -6,6 +6,7 @@ * Author: Liam Girdwood */ +#include #include #include #include @@ -229,7 +230,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol, shift = mc->shift & 0xff; mask = 1 << shift; - mutex_lock(&wm9712->lock); + guard(mutex)(&wm9712->lock); old = wm9712->hp_mixer[mixer]; if (ucontrol->value.integer.value[0]) wm9712->hp_mixer[mixer] |= mask; @@ -251,8 +252,6 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol, &update); } - mutex_unlock(&wm9712->lock); - return change; } diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index b3bbecf074ee..3ba7ca3c1770 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -11,6 +11,7 @@ * o Support for DAPM */ +#include #include #include #include @@ -238,7 +239,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol, shift = mc->shift & 0xff; mask = (1 << shift); - mutex_lock(&wm9713->lock); + guard(mutex)(&wm9713->lock); old = wm9713->hp_mixer[mixer]; if (ucontrol->value.integer.value[0]) wm9713->hp_mixer[mixer] |= mask; @@ -260,8 +261,6 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol, &update); } - mutex_unlock(&wm9713->lock); - return change; } -- 2.43.0