From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 A79AA3E2ADA for ; Tue, 30 Jun 2026 06:37:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801430; cv=none; b=Qszo0UIo8U0A59hFlFCEVYBAjF+V/Q+D5RAG+bNDRiooy/+oYl8YFTgs2n3dnBgXHeSo9JYO+l7+xpgNmVb4gSpGjm9cXs9Vmdfe/rmmbaz0HBfKtZt0McW8r7qBTI3E7sIE8Ko/lSfXj5BPMbZ5t3/q+BNXsTs8ZwQ4onERuY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782801430; c=relaxed/simple; bh=nILbPuYN5HDdgGpTz+3+vLTQdHEtspoh90a2ct25aWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AbOfkEW26OogQ6HdEngcF5wTPyUE3tmsp/MpahxhXvrapoEIKGkyDfUtvKljlVb+NgSOADrSfgTg7V2wv6pvnSEfmWffqzin2QfnEr3NKEsBPctFTOK+0Gjf7k8TiTd6mCetE1bEnvgkQnYQKyWKA1IrVEhQGdg1uHxoTcE/TnI= 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=QByxGNPf; arc=none smtp.client-ip=209.85.210.181 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="QByxGNPf" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8454160043aso3419661b3a.3 for ; Mon, 29 Jun 2026 23:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782801426; x=1783406226; 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=QByxGNPfz18c9zNc8pm/ZcrV541sCt0xxrZyh+49/ZuSLt48wxSnCnu7n9yMFJezQd ENvQZi4W62DR51Tup1ocTTehyVQyXJh0iQ1NIhHF1MrnydSxzVD52ScJWmt0nIbjjeTs ZOvdVyxc786SgOBq0eCAhP8E+myhasTc2cGo0LRmNRs/D8u88IFUDoUSyXTg8DYTMHjs 89BZEggc6cfG5q0pA+Tk2p6bU+apyRBvQmATbMfGb3g4xRPBFCC6LD8SgCcqSOvgbnPr rhhdqS1O70e5vPIbU8GDwI7UgY0Ojc+110tz7iuNIChUDSwnC38mP+sjTAgybwVIJhvX Ia8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782801426; x=1783406226; 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=R68/+t3f4PewQ6AFnx3RivHNLuTDs5ODM+bfJR1eeYVpmttqS0UCH+NJdTms15CN6W Q1riSg140ImA/XzS1P/KM8qfef916Xhimzy5NDrQGAQL+cYVeBQHm44zThdeFrnUhLXW Qj4sarCchOlXSUMhfqjDuvru1YsT3Qv/BrT/7O6ma4Zr6Wlc6F+fNBAJTVKUDGwfP1fW GnSWu7qNX0xbDaGRaA6bvt3dmcLJ59/MTVZMG8X1to/DHw78DUtNvzAi5i2149YV+Rqv DnVUJ5V+9XKpBR/UBbthEJ6fYv+zkCWfybDuP44w3KEUYsMbYyakqnnx9cpUbUY/P+NP BNMA== X-Forwarded-Encrypted: i=1; AFNElJ/RlfiIZ+/eUoK1i0WQEKnFJQLjIC9OZMs8wactGv0PfhmBxwHCmw3B3RFO12mUDoN3pkIXB0hIMxAsTLW6@vger.kernel.org X-Gm-Message-State: AOJu0YyzEp77cSkxuuWQRhhEhwC686ydlAltGadPxt8HOyZsyMN5c+jz Ath1gDu3F5vUsGiNMQNTj9fut4LysH8L/Dzr4zaxDf9IaJCEf+29F92c X-Gm-Gg: AfdE7cn+v8iVixzHWoGABk0ni8rpbkVFBqlgltAsJ6uLcKN2CxPYhE+wDcgn7CCy2sX 6y/IIcumBxLuCr0224RLr6xEVW7yIJU0w7oX8zFZMqAp6Wekcaa7VDejxCHucBDP2AYNIZ58IHb 0vVJasdw3p2WUyD9D6jIJ5MC8B8XB5GAgTFrs/IZn1BoR8Cth1nTM1xIjZAR/KK4M6FSxvk761u OvbiJ/i3O+nLO0UjPcG3s6pZdfk7zcLCNH67f8cDxY6rmJ9ZL4A5WjGHPr+0jh05U0EFUi2DAN6 VMgjtjFr5nC9kdIdnRvCGfu07bWNXP4MqzXUjSulYKWa2Rpg7odxxsG10E0Q6MH3WANP6FsEp/o P47y+rmUG5tWWSDSPoTEDRqq5kOyyyV/cwme2uxXNG4Y3Nmghn/sMROzbNhEIUDAi42aVOjgLfi mfSESqlzYm9lBsPb1YExNlpUJCBft4d6oUTawSO2vh1xaC2yE= X-Received: by 2002:a05:6a00:ad89:b0:847:82dc:450e with SMTP id d2e1a72fcca58-8479eed22f4mr1846660b3a.8.1782801425966; Mon, 29 Jun 2026 23:37:05 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02cd237sm1165061b3a.32.2026.06.29.23.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 23:37:05 -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 13/27] ASoC: codecs: mt6359-accdet: Use guard() for mutex locks Date: Tue, 30 Jun 2026 13:34:35 +0700 Message-ID: <20260630063449.503996-14-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-arm-msm@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