From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 A7087345ED8 for ; Fri, 31 Jul 2026 03:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467549; cv=none; b=ayHT8unuJDGTkQskQFlXkIeZbmN4TTXKIwKb4PhaFrEPMVWkYjA2ZlN2QYNrKrEwLuIieBst3i9tMKTM6FhSoNt9q+JLYxcx0WxDbMgcJ37AzQXjc1/qj9apMuHG0DAWcBX2abPvuVaApmgjpYb6jyf2JEY6+wzqW79Vgwfz//4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785467549; c=relaxed/simple; bh=1WLxZLRtR1h7NZKNx+UVKFODR4z5d7cXPzTHPXjxLYY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qJunBr9ExigptfnJNK0dKlMGLb1OhnyUmoTP7fCpBlTjrO492+UaUHuwNOACSeeTKMtDh7qCC55uy8h9SSw4BlD8sbKo644fE5feMfGyxcA9p3Xs0sYovL5+uin4ixBoEb4cVKlQUr0VLib+/ahl3gOfnJl63KBlKRSofFvYadY= 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=jwH95Qdp; arc=none smtp.client-ip=209.85.214.179 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="jwH95Qdp" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ce87c7e3bbso4674585ad.1 for ; Thu, 30 Jul 2026 20:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785467547; x=1786072347; 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=GI4equXGkZTn1Z91VwxEti3KlfrZRYK99xTcwr8rPXU=; b=jwH95QdpzH1vgsOV3iA1ZYcVnkZhKsbZ8WIPDuce4Chde/9/kPPtk3ncn4Bwan3Zfc niB8xKAJleSgZ7ykGgPdqv62rnVuNgE4+4lRUlmNSGPlBqMgtqQTjkzDt1Qp8HPXPAiG nN/kpmrUCzIeWcqaWvsmSwyAKFHypTCtBylA8k+B96JAvQvyZ00AzbrYA0fJTG0odPDH C612pvCIMIPzneM5Vy6U7Ut7Kr9CihLxcTV4WNjFUKgphkBd6jLb48qhDWP1igd7psmj hirS3Z3oDTp7o7gA6P+kzPXHNuXM0Bd+l8xfT6t8i3uZbnXnmQZgZFncxZjkMmz+Pwfs SFAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785467547; x=1786072347; 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=GI4equXGkZTn1Z91VwxEti3KlfrZRYK99xTcwr8rPXU=; b=PC5f9vRznL0xes3Md3PmX5pbla6Apz3MP/bQM0uDsy8Up87BVcnCUCZn+AqdB0x5WO Y2vzQIFA2Ku+RU3YPjsAR39HOI7TsifXaxN5D6ykZhnQfivFWaL9ph3/XIjUeljwbv2e mexfC2EeJ6Mewt7kPXPXoTA2Be57DJg1XO3A9C67VLkX4/XQXclC0GyhXvl4FJSaH7hY hosCWR8I+hWtxSBxb0OnPrsYxKuM+BXt+czCOWWF2kMIOEe2p7yVLrtKnrMNiGi0VO3N XWUFJ4eTnsMLBdyTbIMa2v8mtp/BCrshxaSaCvztHIiRP/xMDfo1hUqni0CzWuV5Sg1N 484Q== X-Forwarded-Encrypted: i=1; AHgh+RoAIgoBKz7hY5hyfniIaDQ+mfV+kh/9HCmKmPFTL2dEsHQpnMH/N8+WRRrwceJaG9i9M7lNShE/cvykRlI=@vger.kernel.org X-Gm-Message-State: AOJu0YwXEXSECBpPqHVYvovobdThdtPREJgsgZO4lLL8F2ekr+SZ1Tr1 lBqMdIR3PR21WjXtaRsX8s3FVFKRxhnVeCqDfB6ClL/z47ynMdhyhkKwo07Zjw== X-Gm-Gg: AR+sD12x8TjgXc1tn5lPykJaUwR0Sc/Xc5ErA9K3fomXavUc9J7Acr2gobcVRtaFl4w ZfChGg667KAt54iwIvy/oNiOUviSbZ0wz5G0TySPsOJywIF2yRwqS3vStDPL5uPrmoLwPoRjDfU JlizrVOLc9ZFle99bOSfTrgTBQxTIZ+VrsBt9MQB2wHlhrpgUSdkoINTSPeqV/I92AZeqb/qhG4 UaI7WLIO112CFqIovsIv2BkYA1FQSaPQ3lt3RDDTWOm102GKtk2xWRbeuocmXw65hiYe1QXBt3y vACWNqc9R5WxBlCajY5Pl8u/Rzko47okqgCz5Eh8kGzVqnNKAAO65htwX0Ix7Hy7pj7y9CByu3E 0IULbxWlRXTeRbCSN3rr0A8zYT+Yhatls2BwD1WY6jcxJNOyZH1YWph9fbatFS2WupRYWV5Zsmq 1oYbLQO7ezoHstwVoSFTtt1Ei4QwDxL5Jq+UdqIWMOi9M5HIMeCil9h0P4dsbLwLEisKdT4khju V8i3qdR/cThRNg0DmOP3SvPi1r2PTBaKmBjkmACaBd5M+C+OcE9vnmx3qbH46XIaoVwXz4zZ79q ZFyBpDgIXChIATk= X-Received: by 2002:a17:903:1b10:b0:2ce:b096:e50b with SMTP id d9443c01a7336-2d046ee5b05mr4391695ad.47.1785467546977; Thu, 30 Jul 2026 20:12:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d047ae9f31sm737595ad.60.2026.07.30.20.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 20:12:25 -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 , Cezary Rojewski , Richard Fitzgerald 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 , 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 v3 18/26] ASoC: codecs: wm5102: Use guard() for mutex locks Date: Fri, 31 Jul 2026 10:06:40 +0700 Message-ID: <20260731030648.8706-19-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260731030648.8706-1-phucduc.bui@gmail.com> References: <20260731030648.8706-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. Reviewed-by: Richard Fitzgerald Signed-off-by: bui duc phuc --- sound/soc/codecs/wm5102.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index b4d4137c05b4..74b775b95bfd 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -7,6 +7,7 @@ * Author: Mark Brown */ +#include #include #include #include @@ -667,10 +668,9 @@ static int wm5102_out_comp_coeff_get(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); put_unaligned_be16(arizona->dac_comp_coeff, ucontrol->value.bytes.data); - mutex_unlock(&arizona->dac_comp_lock); return 0; } @@ -681,16 +681,14 @@ static int wm5102_out_comp_coeff_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); uint16_t dac_comp_coeff = get_unaligned_be16(ucontrol->value.bytes.data); - int ret = 0; - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_coeff != dac_comp_coeff) { arizona->dac_comp_coeff = dac_comp_coeff; - ret = 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); - return ret; + return 0; } static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, @@ -699,9 +697,8 @@ static int wm5102_out_comp_switch_get(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); ucontrol->value.integer.value[0] = arizona->dac_comp_enabled; - mutex_unlock(&arizona->dac_comp_lock); return 0; } @@ -712,19 +709,17 @@ static int wm5102_out_comp_switch_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct arizona *arizona = dev_get_drvdata(component->dev->parent); struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; - int ret = 0; if (ucontrol->value.integer.value[0] > mc->max) return -EINVAL; - mutex_lock(&arizona->dac_comp_lock); + guard(mutex)(&arizona->dac_comp_lock); if (arizona->dac_comp_enabled != ucontrol->value.integer.value[0]) { arizona->dac_comp_enabled = ucontrol->value.integer.value[0]; - ret = 1; + return 1; } - mutex_unlock(&arizona->dac_comp_lock); - return ret; + return 0; } static const char * const wm5102_osr_text[] = { -- 2.43.0