From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.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 A98293EAC80 for ; Tue, 30 Jun 2026 06:37:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801480; cv=none; b=Co1M/Ri2pFkmk00ev3ZrLghqIceXje10/pLEzt+oC7c1cL/cNGHE3YDJy7yRk6cazinlCQ1wMcr/Cs/WcC6uOJ2xuHvssqDAaNRQiezK/UxWx0hvx//TGU/mkSTDGAsGLYlIXKYEiBCedZ5NAM6BSvYmhifhUH3cEHvBQ+/Vf8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801480; c=relaxed/simple; bh=71e6v5A0pmTCpY/muFVgY0bKxBOo24zj6ulqSaCErLQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JEx27IYvB52Oc++V+pc9I4SbC0th9JSjE1KJRvL+ugzNVc7AU7dZRLAneif/NcX2m3tuELewDnojG/wsDeh+LMfb3p0AapgWv56gv/8k2YoKS6IdJe+JZK0Klhq0nZO4+hRaiD/Oz4Yl/Gz9LLYZ4mpa0iNtQF/ZzQaBMAn22kc= 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=QUYW2Ghd; arc=none smtp.client-ip=209.85.210.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="QUYW2Ghd" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8478fe07f65so799472b3a.0 for ; Mon, 29 Jun 2026 23:37:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801472; x=1783406272; 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=QUYW2Ghda/7TE9utZn4MLaa/1S340Km4V7AppQb67ZlXL5tlo/EMNrq8rDHxt3C0Yl vZFt12UguIehXFBNtF6JgkTsKEW/5J5dtmmMoQg/8wzhFwrY8IB/rT5xyXnzaQpEIqn0 QiQLkHaIQObd4qRmaD88IhMJXqE1GGYxtsHCn6W5PL0MKkvUDkHdU443vOcauT1IThZB 3CqPWTJF3Ku48byz9VQ6BJn+ZujZS8xtx+E2gXMzx1Ptkv6GJt9R1lMuMkfGnhP3LlIe 2q7QiuahTPwD7hRmnSzMBu4u5AhkFM2p2SqngE7x1cX4KWwYobhdxVloKIC+wTae996t JbTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801472; x=1783406272; 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=II4gEz5U1i+pV8GWpJTrk8Dvm5OBgjB1BDH6SLJO+anV9qQ0ExraBHDP6I9dQ/Dhmk hrVnH9kEx5UhxqVyR1+0YN6sBJUw/IyQ3tbaC5HdwtSh+6vOumqm0qxEmAEFd28vAA1G dXdm96ih8fShFSEoR2W3Y683hjbRz2T53GYLnlKX8dr3AD/eza1Mga7Auounp9NqqZUJ tzuxJNQrGaFT787A54G67VVn8nOdoZ8Rr8Blz1HbX8Ofh4tbBaee6bQZ/VPbPjsNAUtz Ek/XdUPclMJfSDeQm4vA97uer9DFLB2/6HryMMfDSTyXUHfk/qenobw+sZ3YWiGP9/zE NRBw== X-Forwarded-Encrypted: i=1; AHgh+Ro4NxtcksYS/q91GacW9owHRfJT09h+v8iFpR1pBc9Lgb1D1816EQ5OPWn94gWaxo268TiI4dhM2Xc5Aeo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+stIYI2942my1KQKMS3qyHskqA9Mw6PVuZ38b6azIb3vqqgqv d5svVzfRZwuJKgBwosX7F4wrPy3RA0yQvw51m9P0fSzxg8zGNH3pEUOH X-Gm-Gg: AfdE7ckZC9guLmcKQH5SfnwPLd6ww3c4UcLR7V7BfSND6P3AI6lwgHSvCCW99V49PUM 0yTdS2uQuU5F4fNShevdXwd2k+CQgSW6mKxll5r4CgYMR8UBN1GolxmooN1rwX+DFKwIqDRHw3O kzj4LjRT/aGq8NB/3GLs+ZN10W+2LnIL+1jcxf+9NmdzYnHsnUJDJB6xQQQasJLrj3ZTNt+VVh2 ODo5U8QLRZVLS0+S+2Qu6i20g11jBSMcUHyuVKpO4Kb2nud9r7+0t4TYtPQtfNZwsXdNWTBi4JI H0p5CTjOjjB36BkR/y1Q432KAN96T9/L/lg7uWHk3PKBFi2LLNLJFuBLb+uj5E2GfKscrGRIec3 VkAErSIhpOWVnIcUwrrmBXo3nHBNVZFPcVwmAsTso100VpdVdgJ9wKNiaKKkTiDRsGqFs0nhrSv zVWnYrmt5tUgg0Z7p83W+7C+DHLl42WjtR60SmJnOS6nfv1Jk= X-Received: by 2002:a05:6a00:3d0f:b0:847:8a47:264d with SMTP id d2e1a72fcca58-8479f22aa22mr1967010b3a.36.1782801471671; Mon, 29 Jun 2026 23:37:51 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:37:51 -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 19/27] ASoC: codecs: rt5665: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:41 +0700 Message-ID: <20260630063449.503996-20-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630063449.503996-1-phucduc.bui@gmail.com> References: <20260630063449.503996-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