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 D57CB47884F for ; Wed, 8 Jul 2026 14:21:38 +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=1783520500; cv=none; b=FmX17KjK85SHw9HcPM/te1JCk8pbOHgKLtoast/8PHzT8YlJgVRRCgE+NddZsKzdLBvfzguYXkLWUpijBy85KrzRwZVJRH1zvu6/SjWxdchHjKLgfb8DdzgWbsZfcyXCx92hVFdGI03ZUDEARAc129+SzV4tmYtbTvyMCzponT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520500; c=relaxed/simple; bh=71e6v5A0pmTCpY/muFVgY0bKxBOo24zj6ulqSaCErLQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F+S759bVMvz/fWGNbDwF2V92/rQP2Cjq8eerXx9i31mKx9Qk3oA8iAs24c2eTHUCvGGS9iPc86aAd3iPp6S6wD+c6UoNdnIi6Qax8g/vDW6sJdg0c6l4GRssfKEyd34D6MWY8J7dJ4ToZhI7IF2dzogVN9xWvcP6bsVGINpgi3g= 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=SHsvHxu8; 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="SHsvHxu8" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2cabc0a1ab6so10647705ad.0 for ; Wed, 08 Jul 2026 07:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520498; x=1784125298; 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; bh=jE/vGes9bWof+nCBjw7kvawhZty+DCUG3JNg48uQoDI=; b=SHsvHxu8703aB2yGEf6WaOaN+sy9+s06bbZK2fePm09Kso+44hRvlpqnRlVBE4+MUT PuHFHVhQiu7w/1f/8loH/1kCeETWYHHPo6my4uh1BL0wg0qEbQ93Z3K9BhygQ6jBZCPr 17jNMF6Md8qSDjHoiz3Ddq0iC4+l0KLE6G9N+FZcSx9j6WG1Pnd7Be2wH48yGI6sFUPB DMEwQJ2iLGIYkwp/efldhxLgdV/cDK9dBGYx901DnNz8bkqAJ/YqmHrekU9nZZ7wQ5fM X4FA1VsJ4Zu/Uqq/xFKrMynFzR2ZhI/YPt+ybscmCggn87ZZjmezrBq/+OX52VCCIIM8 BlYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520498; x=1784125298; 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; bh=jE/vGes9bWof+nCBjw7kvawhZty+DCUG3JNg48uQoDI=; b=L/UHBUdfAI5BjhyhP33rt+Us6guns7dvBbX6U3qrKoQQed++CkXX5Rh/PdVXGWhTsC Sj5bJl11nnyVeOQMOslb0lH0aBB3Hj7oiqMZ/GPXuc2GakEHhfRAduum1TxdYR6jWBWR R4h4KM78BKWwLlDgm/V1PvpT1iCJuTkxxZyV4w6bZ5jsqMBcehuF4NZhH3N0iZReSD+v cusUSbh2BfVp3/nhvM3HprfMW1C2ML/nBqO9Ntgwqq+N8XnmCXnJH0NGajfyHLkM9Zqa EQSlUldkC73VS9tb0ZD+ZuU322+VhT4EhzNFputD1TX8MAiVUsoXI7nHzO+jEEqrdGe5 zoTA== X-Forwarded-Encrypted: i=1; AHgh+RrlGOlxoQyc+KkCrZwztoXm0O5foV8yeR1+9eryMBfW1HAUG5xroFDSm0Ag/9XMSiA4ecAu2XuhjQvO1tI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7MBq74GbmXeQc4peYCAC2BqGD8Ke9rV7ou3j0eFY1hd09ua8/ wvYcm4S6pBiTrdtkTp8NPa6/KGKBvjGUNXDd5oD6V6MRw0ru1yVX8+hh X-Gm-Gg: AfdE7cmnzqh9LipU/wQViLkeos1VkdrDRfcBMhPPzbT+Kmk5wcdIVNVf4tiqx3Dhm0S qaDxPXnNArUpJtA5xv19afT6c2ezhLhSEKlKGZ3eB7VtpH1P8/zkmP+2p4fYHLUvjwQ50Cr21GS g8O3Z/KbZZl5B9yfNoLoq5ptrTkuI/avXqZviNV8dGylmnJmnji9YLJW9rlDmvAJojaALPPO6wS pdPOwpIaMN5EiuMITxxyPhJXNjSFvigufOpQjR4n7lEft+uceeLSXAXYNHwtsfbGqfnpKZqG3w3 0QgqbbAUZaBhGWg8Zq82ZSHvUZQgIr57Ojk/pS5tyjxnK1bzVyt3rDQ4XiU81NLkXLrYMzZLrO4 4cdsAUHljeWxo7D0otkKErGlEE0hnqsdbPMPtCuUgPR8NdcarQ9uCPtJeNUr/MD50lx55Ppolid Djd6NDinYQvEm5VqFrgl5Xu9jkl71Xd8/Xn9tNiIPCy3y+frQ= X-Received: by 2002:a17:902:ebd2:b0:2c6:a772:7e43 with SMTP id d9443c01a7336-2ccea39354fmr32045325ad.18.1783520498057; Wed, 08 Jul 2026 07:21:38 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:21:37 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH v2 19/27] ASoC: codecs: rt5665: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:26 +0700 Message-ID: <20260708141734.578926-20-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708141734.578926-1-phucduc.bui@gmail.com> References: <20260708141734.578926-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/rt5665.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 48f57cd0920d..1d987472ba42 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -6,6 +6,7 @@ * Author: Bard Liao */ +#include #include #include #include @@ -1208,7 +1209,7 @@ static void rt5665_jack_detect_handler(struct work_struct *work) usleep_range(10000, 15000); } - mutex_lock(&rt5665->calibrate_mutex); + guard(mutex)(&rt5665->calibrate_mutex); val = snd_soc_component_read(rt5665->component, RT5665_AJD1_CTRL) & 0x0010; if (!val) { @@ -1274,8 +1275,6 @@ static void rt5665_jack_detect_handler(struct work_struct *work) schedule_delayed_work(&rt5665->jd_check_work, 0); else cancel_delayed_work_sync(&rt5665->jd_check_work); - - mutex_unlock(&rt5665->calibrate_mutex); } static const char * const rt5665_clk_sync[] = { @@ -4564,7 +4563,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665) { int value, count; - mutex_lock(&rt5665->calibrate_mutex); + guard(mutex)(&rt5665->calibrate_mutex); regcache_cache_bypass(rt5665->regmap, true); @@ -4601,7 +4600,8 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665) pr_err("HP Calibration Failure\n"); regmap_write(rt5665->regmap, RT5665_RESET, 0); regcache_cache_bypass(rt5665->regmap, false); - goto out_unlock; + rt5665->calibration_done = true; + return; } count++; @@ -4620,7 +4620,8 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665) pr_err("MONO Calibration Failure\n"); regmap_write(rt5665->regmap, RT5665_RESET, 0); regcache_cache_bypass(rt5665->regmap, false); - goto out_unlock; + rt5665->calibration_done = true; + return; } count++; @@ -4635,9 +4636,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665) regmap_write(rt5665->regmap, RT5665_BIAS_CUR_CTRL_8, 0xa602); regmap_write(rt5665->regmap, RT5665_ASRC_8, 0x0120); -out_unlock: rt5665->calibration_done = true; - mutex_unlock(&rt5665->calibrate_mutex); } static void rt5665_calibrate_handler(struct work_struct *work) -- 2.43.0