From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2A64C44506 for ; Fri, 10 Jul 2026 05:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jE/vGes9bWof+nCBjw7kvawhZty+DCUG3JNg48uQoDI=; b=KAtTHwz81Y17/SQDWQmeSm/ZSZ 4V3YgV1ACOi+4fMfMGjx+zIC/fMyohcbH3rAsdFobyhWfwZp2Gx9Ib4VLntjELOHI2pkmJ35Kmkhs 9cQXWTOJPdLNftHnMF4uLE1Hc81CR/lEy4f8vlKLe+lRaXPXpBViiznB8jQ7mPZsk0p+TiurwBLmj QO32iOY6e2yiUtmZjKz//vwaYAmCkG/PeazwM/lV2iHRHtVcqOEKIr8eig6W9FpAySfva/Iv4aiey y6etXyUhsAEDmh8rDbaSlWp0mVjs2vH/yCSx3XKyS9+Svsg32oIl6hH8MTw6oM5BCgmZoacGc3Iny cx8UcZQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi3So-000000049XX-01ok; Fri, 10 Jul 2026 05:07:50 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wi3Sl-000000049Tc-0v6d for linux-mediatek@lists.infradead.org; Fri, 10 Jul 2026 05:07:48 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-8485bd28dd0so482649b3a.2 for ; Thu, 09 Jul 2026 22:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783660066; x=1784264866; darn=lists.infradead.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=jE/vGes9bWof+nCBjw7kvawhZty+DCUG3JNg48uQoDI=; b=O4M6QhmtWF8RvKrMLDIIFbKIr3ycBrODFzz/CUDkkr55WoAu2vFEpORbBpbSqSAUg8 rEZOY6L7N1TWxUp4MEDGlYn5i6QNNzN6bHcy3hZoOBK0XhQDgozGogsteGoH8twChG3C v3BPSJI7SIrE6Gaj38F0jvK0Fc49ngbuaUGpiMn6eUOiu0OUwxJq5M2xzNpfmaHqFoY7 pNme0IPXOUj6iXFXlfMiBucwnHPcwyfzh3+GxiZxZiRCjrjFwDxRzZNlS4SD+YgjDTu3 21p2IIGT3HGX69RjwVcBkDi8gmT86mbTxLDUZuv1n3UYgCMzL/KyH6C3b8zn1NJJ2175 eprQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783660066; x=1784264866; 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=jE/vGes9bWof+nCBjw7kvawhZty+DCUG3JNg48uQoDI=; b=QQvygfHmiQYghWDBo51Plu7Pa2M7/8WcJDgafIWxcHpyaEaXtvQM5JhiE+W731ih5f O24pHcMwl04AuF4uOXm5Th4Cu++3qPqh5qFfLoauTAU1zdf7CwPKy3Z/vn0gIUDQ3Nt/ dG/7J4MxZzQk5frIgQ+9Kt5Id8ujhOYopLPU/p69zRZpAuNVJp2FA91O3ovEEzHU7Th/ RaptV+Be9UXB324/BpiED1WECcE4+MNY9oynySjjxmYJP8DyGk68e5Uk947Cxn6MG9ef QX7q3Lzvc5xMXThzsM2HUXfgLaQ0JEXaRN5zZCL471K5CRfR/VVUQmBeUhJSvtUZYXus QkcA== X-Forwarded-Encrypted: i=1; AHgh+RouzqyYJOjqsY82Ltws14C5lYJk58mPSAOEuNX5hVHVD5q60Vy1sBkYnRgANU4roKCpVUjE7aOplDA2xpPc7A==@lists.infradead.org X-Gm-Message-State: AOJu0Yz7TcgP5PrAa7KIhcVy/sTZVwzlKq8wZVbkOTd422twkjwBde6v lnsLpf0OyYnjbBH8T2e3uLeehDac+K7KmtKF8sTUgPbAr2aVZDhCqbzB X-Gm-Gg: AfdE7cnqiXQWg65zVLBds1WCbo5b9Y2NBRJh+XhOxnia6V+fmXQ3Gfyshn1YO6kGAsq sci9QKZV0FWJlTwXkxvz4cFmMQ6SdRl9P1FcC/3UjIgRwG/t3DzqutAqkeproxpYZNR1zzc5QzG 317ttNHcb1P5EmYZyg+1uGC58EWBVWeH4m4legvcwmqRj6F6jTgi/+wcUplXzVj9Npeist+hw4G JWPE5Vd6xRAjalFeWz2J2AbRybnBV78oeOHQSMSxGeDpHlZuU6+BnhsGIMMFR/r7iCEh5VYFMr7 jaZeBf+fniW98XQLqshuB4fIaBPM3rSapZ5X+UskWWyyBSzdNXS6ckrMA+GAkdO05BZhSb51XBY v3SUti/dUC7F1mOsIyfenqvo9mLr8VNn1YxYbGolXJhbcYa6UozZSAcTn0p4le1B4Dj9SESy02Q koj7zgi/8HHtcMacwg3mqlfXsv/2yV0j/cyXGezR6j1l4q2fI= X-Received: by 2002:a05:6a00:3923:b0:848:7b92:8e79 with SMTP id d2e1a72fcca58-8487b929051mr507140b3a.67.1783660066423; Thu, 09 Jul 2026 22:07:46 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84847275fa0sm3400499b3a.22.2026.07.09.22.07.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 22:07:46 -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 v3 19/27] ASoC: codecs: rt5665: Use guard() for mutex locks Date: Fri, 10 Jul 2026 12:05:03 +0700 Message-ID: <20260710050511.14439-17-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260710050511.14439-1-phucduc.bui@gmail.com> References: <20260709045902.498848-1-phucduc.bui@gmail.com> <20260710050511.14439-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260709_220747_274215_634F11C4 X-CRM114-Status: GOOD ( 10.60 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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