From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 8C235480951 for ; Wed, 8 Jul 2026 14:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520450; cv=none; b=lztAfMzIgkeB2rEIDbsQ0AK/kaI/S5FdNlYFzL0LnGXHlAPq8jLGb8PYYA7DdKJEHRnP8UhvQWfcr4loSWY9hzngzigDramOHLTfUL2GorWwYI3DiwtS70/y+ER5lJzLrWoSdfLCyBWLn2eDkDduchQTEC2omIm/esICvWnH8eM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783520450; c=relaxed/simple; bh=nILbPuYN5HDdgGpTz+3+vLTQdHEtspoh90a2ct25aWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/TlPQG0TiU6SzpyJnJNp5Af8ZL2WjdnKidI0HIAba6ueFwdhrFdH1WtIatKZrtJ1HwGs5Ca8cWCg0OqOetXaR96zgzriNcBdAD19HTLiuAId40T/I/NH7Ny14N88aJToBaSuhzkcmix7GC3OaZx9tMbahI3qr6n5S0ZXJvEoqU= 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=WkEDZbZw; arc=none smtp.client-ip=209.85.214.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="WkEDZbZw" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2cc97653887so8490075ad.1 for ; Wed, 08 Jul 2026 07:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783520449; x=1784125249; 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=E+Xd5j1FUZKxifc/BkYvhS7CfaonB+06ASWIZ0hNhk0=; b=WkEDZbZwU9JCOFbwkEcQmPeX935aWTo49+/CbEHuuFFGxh5EXcMPNkPCVWZVDZTzO6 Hky5ubjnZjCwZF0A2/dvJcVLV91ITlbbhUusbZTy60WFeQqGpz+r6tbbd9ckBIL4HU+r bNW0+WPQfFmeuC3UDjDB7ML/oYpnWnScFmYZtb5KrYaOR4lRa0Q4HFEklrvxkd/M8nsi /iIRA0QOkfDcvb3bFqimDTTn1QUBgDcNW0QflX++iaDJlQPAD7oprObAF0h2/Ubr39zS PF19XiVn9gWsvCEk7XumvA03qiKgxBc7VKjwmYrPQ24OE3aPqOTi7A4oT3Stb2GSDkJl jYsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783520449; x=1784125249; 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=E+Xd5j1FUZKxifc/BkYvhS7CfaonB+06ASWIZ0hNhk0=; b=CWMiRE71oIzaUGGRTOCgecJT/zetnI0ngoHkJucDtH2FFO3e1OPsmU4FlxorlMugmp kl4thEMwDwkkTnDaEWl9jIrfQCpuik4LY1s1aiWwBC+8APqitfe1R0bJK+d0DifAfe0W RnVkl2gIeQjIrMgSEcjkLswwijTnmiXa7aD4aWndaZZCnEOV4bKuBJko9l9M1tgHlJd1 n+WakNREDlhYhsXRgQzDJEBtBGqPRJ0N2Wzwh+/+GU6qklfOmr2KOE2NTS1cMPfLxfzM h3Q5MDclYx90UMA/MNja5Ff5NNKtW+hwxGpy1lax4a8bSvS6J+UN+ezVdxRv4V3uUsQP YhIw== X-Forwarded-Encrypted: i=1; AHgh+RoeeiSKEo62w4FO/DY9x/GHFHVKl2sHb3lgSrMRE+VZP2odtGxazWoItmfEQ6zZZ5iAxNClhE3hez3KYUY=@vger.kernel.org X-Gm-Message-State: AOJu0YwBG7qQbuI9LOjDWLKfLRFuM9D+018cFtc7OmPFeAUoHn2YTCYS 0g8Hvt3hR1ewMxudWxxprBAFiw8hn8e+fRIt+VEuW8QnEZKb+ajOY2JR X-Gm-Gg: AfdE7clOYr30/Oxi2ELjMULgjGT9RbRSF66+1ec3ewOrJGZTbR7jHUG/IiL0b6IMdLa 8NytvcZXZa3ij/2FvTpLPVClVU5SBCPkLwc6HYPbbIsm4GQniZErJK3bwDGsK4tq3vxY4iskq+D sbKdyfZ1OsHtYmosNcx4ZcErN58ULRu7YHM8Mr2I1Be70FsiG2gYr2fV0ILun+T3kvDc3pd+KAL uBJuftitQZn18TBbwrROmK9WM1uSxFgkWOcfBzvmMWAXPLJqN24Xpx41qVtMWUt0BgIjlbLJw86 EWO0AVc1lzpOOlyiIqndQkSNO+FTCa/DvLkH064SE+7/Fi1fDgGwdBJmumbhbznEdg694sNveUR ViedeeZaUlEW3MhvLstf1MzDTxS/qwgbaOYKt0Iy+djWcGTGTlhSI7O5Ui0eO4N/SS+4uJmm8fQ xMNRuViDafI4Z7esnQtHVMH/RcMWz/niEcnTzZPih+wDJiVlY= X-Received: by 2002:a17:902:f64f:b0:2c8:248a:5dbb with SMTP id d9443c01a7336-2ccea2d7881mr31360455ad.7.1783520448903; Wed, 08 Jul 2026 07:20:48 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3bcc0sm28841575ad.67.2026.07.08.07.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:20:48 -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 13/27] ASoC: codecs: mt6359-accdet: Use guard() for mutex locks Date: Wed, 8 Jul 2026 21:17:20 +0700 Message-ID: <20260708141734.578926-14-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/mt6359-accdet.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index ed34cc15b80e..e1190c644021 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -6,6 +6,7 @@ // Author: Argus Lin // +#include #include #include #include @@ -398,14 +399,13 @@ static void mt6359_accdet_work(struct work_struct *work) struct mt6359_accdet *priv = container_of(work, struct mt6359_accdet, accdet_work); - mutex_lock(&priv->res_lock); + guard(mutex)(&priv->res_lock); priv->pre_accdet_status = priv->accdet_status; check_jack_btn_type(priv); if (priv->jack_plugged && priv->pre_accdet_status != priv->accdet_status) mt6359_accdet_jack_report(priv); - mutex_unlock(&priv->res_lock); } static void mt6359_accdet_jd_work(struct work_struct *work) @@ -416,7 +416,7 @@ static void mt6359_accdet_jd_work(struct work_struct *work) struct mt6359_accdet *priv = container_of(work, struct mt6359_accdet, jd_work); - mutex_lock(&priv->res_lock); + guard(mutex)(&priv->res_lock); if (priv->jd_sts == M_PLUG_IN) { priv->jack_plugged = true; @@ -450,7 +450,6 @@ static void mt6359_accdet_jd_work(struct work_struct *work) if (priv->caps & ACCDET_PMIC_EINT_IRQ) recover_eint_setting(priv); - mutex_unlock(&priv->res_lock); } static irqreturn_t mt6359_accdet_irq(int irq, void *data) @@ -459,7 +458,7 @@ static irqreturn_t mt6359_accdet_irq(int irq, void *data) unsigned int irq_val = 0, val = 0, value = 0; int ret; - mutex_lock(&priv->res_lock); + guard(mutex)(&priv->res_lock); regmap_read(priv->regmap, ACCDET_IRQ_ADDR, &irq_val); if (irq_val & ACCDET_IRQ_MASK_SFT) { @@ -474,7 +473,6 @@ static irqreturn_t mt6359_accdet_irq(int irq, void *data) 1000); if (ret) { dev_err(priv->dev, "%s(), ret %d\n", __func__, ret); - mutex_unlock(&priv->res_lock); return IRQ_NONE; } regmap_update_bits(priv->regmap, ACCDET_IRQ_ADDR, @@ -498,7 +496,6 @@ static irqreturn_t mt6359_accdet_irq(int irq, void *data) if (ret) { dev_err(priv->dev, "%s(), ret %d\n", __func__, ret); - mutex_unlock(&priv->res_lock); return IRQ_NONE; } regmap_update_bits(priv->regmap, ACCDET_IRQ_ADDR, @@ -521,7 +518,6 @@ static irqreturn_t mt6359_accdet_irq(int irq, void *data) if (ret) { dev_err(priv->dev, "%s(), ret %d\n", __func__, ret); - mutex_unlock(&priv->res_lock); return IRQ_NONE; } regmap_update_bits(priv->regmap, ACCDET_IRQ_ADDR, @@ -540,7 +536,6 @@ static irqreturn_t mt6359_accdet_irq(int irq, void *data) queue_work(priv->jd_workqueue, &priv->jd_work); } - mutex_unlock(&priv->res_lock); return IRQ_HANDLED; } -- 2.43.0