From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.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 C4A803F1ACA for ; Mon, 27 Jul 2026 09:43:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145392; cv=none; b=RE1ikiyKcoZfZRLuUQCQDu+B6CNDsGazsbbWScnOE/hjGor8vjJ0uAS7YVRlH1/naC9XqQyF/WxmOvGilUGOBEeLKL7Rxb6p3W3k6wkwvwvU5nZ8SGi/sVd20ydSl8HNz7eR5MhNFq2XwuA+ftugsFyIiZOgEiPn3YH/wQbEZDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785145392; c=relaxed/simple; bh=jJta1wP6Gxka/gvOOEwLo5cIEFpwWGZWGRX7SMxpNTs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Btj9o0b7QDmnFlNZWyjg+jxEA6URwX/emQPjc4/TAyuKMo11BG9xyfMo4letfDkOmczJjylEhgNUPgCvcnvKD5htBauLbEeGXABWlxjfKjZ6GSqiI7lOUo+mUl1g0JZms2WE8RfbZ6933PiovbZJ9vS7MK6wyFxEjCOuMRzZA/M= 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=p6zZWO4W; arc=none smtp.client-ip=209.85.215.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="p6zZWO4W" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c9e0b89e228so1661724a12.1 for ; Mon, 27 Jul 2026 02:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785145381; x=1785750181; 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=GJN91k1ihxweTvZ2euRdyyI5ivn2nMtlaxC9t7yRgHQ=; b=p6zZWO4WFNSf4I29PAY/+16CueKGg7gFvNimi9yC37eoF9kXjRm3LZpGCqgfyw8MJt iA2RqAh64rEduuLqD+f//zO5KOhm7mxkYlLTaZDyYm5xDNfTYbZ04bT7863hLK5c44ZN Ws25fO+xjZOPQb1PItnKMGN680SKyRjJhJQpOYb6J1j1bHbQgpVjQi7sXzw9CkMg5ysd OkgdyduulDT0vZJIZhBK1O2YI9rGmPuUnkfQLPTqEU7yLSp+S0hUHH7fMjafVlE4c4dH IksYOPNenSB5I83E4gAbGg+/A9zTjDFDd/JgmWiLkjHpeKzHkzAlYis1CMgqPbCZnxqm PWnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785145381; x=1785750181; 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=GJN91k1ihxweTvZ2euRdyyI5ivn2nMtlaxC9t7yRgHQ=; b=YJz5Zo8cGvwMij0LS6iSaHG0d+B3r/4XGC1b8/qC+qtEmTWwTyHtEvcKHn/xQhPxZA CQ3RAjNjmutXL9mpU7PIIoOtAdUlnw/jVKM7YxY+/qxbZ9YGTBgIjFkqrR/js1iPFO2d I3t8VLD5SfH9IyoY4qM6WCrWGjiTYU36rK78phm8bc+l7oHGHYDQa47yGGycS0gOJugg u4aIa1b6BZMgulwAa13Tg9s1X4o2Qkh2QRBHbogSea0TbhIZXItPPXYxNp0viUazSAr1 tk0Ku+QuQqpZtz/aa/4cT2Usm8qIH5Gal10pyY6Vxrr0fXY4iO5HQ4qHKxkFLf818GYp +hYA== X-Forwarded-Encrypted: i=1; AHgh+RqPkZNFZNAhvnvrrbo60eFaa05/wQVmDAMltiFv1tAy2NzHmwebgLK0QD0Vn6Kw/94R3JRdqst/+iu/dGQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4cnchbeR8/CKfiQVVz+FfaGMVU/54IXIc4O+1WcbyLanB4MjF nVztThlsXsl+UfNrgp2qePFwAdGa6AvzDhn2TdbMVNl1WsFfhnaqmnTX X-Gm-Gg: AR+sD13KR3S8vhNZlOMDnd0pcYhUsU0T/qFkqqSyWRPddBBKhC+vZC8T9PuzIeCYrzw QgikMUuh8Jx0/SDhYXTGlUr4NDlHC0q3btad14YrKbJlhRY7xUiUkCwHmIZQv2D4qYRtWZcierg cMq3DVREsb80hLXepV2VtiPEaAydYH8enTilpT7ZJycELl/Xe/OEJr3VOv4LpYC/+xqPx3vunbW nsaN2c03ZiAdS5wRBzWqY+M7sNY2zBajmxKAGZE3oL6WxQd1RV4WuR3q3Evp2Dl3RWz+ZjR8k3t B3CW+ihPWmmsfGUoPU1v0YDC6jJEtOomwex6MECX3AY6rptxWkHxfXegl1AFV8CMVp7tEAUOABP Lx0pPv+6//Lt+8i/KV8JcoDpXg+7yZQ1LyLhawEv71QYBhv1rRN0zlbNaWCmZSXyobHjnMO7OSu Wfz0SWRDu9SMPg0R6GCk2chNtVip4FY4B4d6I6kNnL6RGQs6yDYdiwQc3hm1RZBUcEQO59XIANW MTmpZ24IuOZx3EtyoqONg== X-Received: by 2002:a05:6a21:a346:b0:3b4:6026:6c5d with SMTP id adf61e73a8af0-3c67d9b40b6mr7806340637.5.1785145381283; Mon, 27 Jul 2026 02:43:01 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbbb66b5ffesm2959018a12.19.2026.07.27.02.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 02:43:01 -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 06/26] ASoC: codecs: tas5805m: Use guard() for mutex locks Date: Mon, 27 Jul 2026 16:40:26 +0700 Message-ID: <20260727094046.23001-7-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-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/tas5805m.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c index bcc8cab8d667..f76e04b403b5 100644 --- a/sound/soc/codecs/tas5805m.c +++ b/sound/soc/codecs/tas5805m.c @@ -12,6 +12,7 @@ // // It has been simplified a little and reworked for the 5.x ALSA SoC API. +#include #include #include #include @@ -230,10 +231,9 @@ static int tas5805m_vol_get(struct snd_kcontrol *kcontrol, struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); ucontrol->value.integer.value[0] = tas5805m->vol[0]; ucontrol->value.integer.value[1] = tas5805m->vol[1]; - mutex_unlock(&tas5805m->lock); return 0; } @@ -249,13 +249,12 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); - int ret = 0; if (!(volume_is_valid(ucontrol->value.integer.value[0]) && volume_is_valid(ucontrol->value.integer.value[1]))) return -EINVAL; - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); if (tas5805m->vol[0] != ucontrol->value.integer.value[0] || tas5805m->vol[1] != ucontrol->value.integer.value[1]) { tas5805m->vol[0] = ucontrol->value.integer.value[0]; @@ -265,11 +264,10 @@ static int tas5805m_vol_put(struct snd_kcontrol *kcontrol, tas5805m->is_powered); if (tas5805m->is_powered) tas5805m_refresh(tas5805m); - ret = 1; + return 1; } - mutex_unlock(&tas5805m->lock); - return ret; + return 0; } static const struct snd_kcontrol_new tas5805m_snd_controls[] = { @@ -332,7 +330,7 @@ static void do_work(struct work_struct *work) dev_dbg(&tas5805m->i2c->dev, "DSP startup\n"); - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); /* We mustn't issue any I2C transactions until the I2S * clock is stable. Furthermore, we must allow a 5ms * delay after the first set of register writes to @@ -345,7 +343,6 @@ static void do_work(struct work_struct *work) tas5805m->is_powered = true; tas5805m_refresh(tas5805m); - mutex_unlock(&tas5805m->lock); } static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, @@ -362,7 +359,7 @@ static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, dev_dbg(component->dev, "DSP shutdown\n"); cancel_work_sync(&tas5805m->work); - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); if (tas5805m->is_powered) { tas5805m->is_powered = false; @@ -379,7 +376,6 @@ static int tas5805m_dac_event(struct snd_soc_dapm_widget *w, regmap_write(rm, REG_DEVICE_CTRL_2, DCTRL2_MODE_HIZ); } - mutex_unlock(&tas5805m->lock); } return 0; @@ -414,14 +410,13 @@ static int tas5805m_mute(struct snd_soc_dai *dai, int mute, int direction) struct tas5805m_priv *tas5805m = snd_soc_component_get_drvdata(component); - mutex_lock(&tas5805m->lock); + guard(mutex)(&tas5805m->lock); dev_dbg(component->dev, "set mute=%d (is_powered=%d)\n", mute, tas5805m->is_powered); tas5805m->is_muted = mute; if (tas5805m->is_powered) tas5805m_refresh(tas5805m); - mutex_unlock(&tas5805m->lock); return 0; } -- 2.43.0