From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 6D787480962 for ; Tue, 21 Jul 2026 10:28:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629685; cv=none; b=a7FPvuYTuxU6nbqNq0cEbnhjVf0C/rqjalO2aq6Yemr0Gl6uBpm0RabOE34HU86ut5Lq02t54bhuO4Sfo663Nf1lWmulbNnV1yxEovIk/sAEnWb3OoLjKuvA/ouZu1YWnhC/4lJGCcXNgljEaU5IcabiuGTRxj02lZ6Bsi1PvBg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629685; c=relaxed/simple; bh=nILbPuYN5HDdgGpTz+3+vLTQdHEtspoh90a2ct25aWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CAk8I/FTtPkT0Q+LA3rT/a29nINZ1AXKxVjopxSCJ6UTD+rjVStE8+NWVzMhEUDesPv8RZhYWUFLiXPjP9jWlnYhCpdZi+ilQcvJtpXLXCjkthyuiY70lBnOXhPZFT3HMztzQ5Ho162iRdJy5iDbFsG9UBtLodmGPcTQ9naX5Ug= 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=kGAa3yEq; arc=none smtp.client-ip=209.85.214.178 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="kGAa3yEq" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso127583605ad.3 for ; Tue, 21 Jul 2026 03:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629684; x=1785234484; 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:content-type; bh=E+Xd5j1FUZKxifc/BkYvhS7CfaonB+06ASWIZ0hNhk0=; b=kGAa3yEq3AJSW6MhopbgjGSlNVvDhBP/TFOwgehmsbJBtSc25gAW24mGQifc6jhpQj o/HhIlus3GQhC9F4DCa8dguRPDuNe8hFMwvT48hv9Lg16MNwnDPElyTe5D7IYGIe904p iYyUo7Ob7sGV4N+3PcMAkkX1eyhqw7uDo5KDhfkf9lc/2UKnvbtuEbBBfpY8oGMZ84CX qzmiHA1nIxEMlLMIbwWVXBVzSM3qbpYBu/CRRKzOTYai1Y9N05EUmIvYb92N3AS044Ap i5B15IdLAwiZKkigp9+/CQpW1kaTTZDKB1tFDHekY56MArqwxrkNdP5RGYbEtOGhAJxT RX7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629684; x=1785234484; 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=E+Xd5j1FUZKxifc/BkYvhS7CfaonB+06ASWIZ0hNhk0=; b=cQWZDx82H53Ks0aU2Y71HNbvqRB0d7mc7Zpr9zaZR4ERoRjBY9b/bvjojjgFei/UWS dTpGQzkU33rvM8UUNfVxeUsM9qtE1UoYKe2IpGmNZwotsHITIircI3L+smOfZ8UhwjcB eK95vhjrnOCEisAR0eMTELDWrrxI35opLxQqAJb1oESPgNVi3aHdI04NGv80E9vERKhl pf1+UCMzTLD1FE+RNjZXA7KljU2RNcUAxOT1KmKqHhOt4cDRd4g/A/ZmBjZiTPSlxXX4 2EgFtqcV9qJ1K4I9XVqlQPTV2egglqJvXKtnkRAtm0WbvhalNfvTkleiVSoyo1N/tK6I C0Cg== X-Forwarded-Encrypted: i=1; AHgh+RqDhmXLsxMVcewuwRmeUW7Qad1Fun40CRNFDhYJTSh7h5Kb1s+/KboEllnBwKHAdeJ5favXzWe5hXqbjA==@vger.kernel.org X-Gm-Message-State: AOJu0YwdziQDTQhTq2Ybq7FZKv5nA9IF7jgtdeawOSOsiV4uu0IH4U8H i3kBPHvNvEq8cNkQ8yiHo42BKSs/h79k3YdFZon5DOMMuo96nIcJ3rmI X-Gm-Gg: AfdE7ck7yOQQIg2B3jK0W6e/my2wjexxz6peXQkEPrkZpxY1RC3i75Rm5T6+C2sEf+P OVUqGF0pQeWHRCAiut/wgGeMpsBOMextQRDAacVhSs2CCDKdZ3s5NFBakkZl9wKKEdAJuywSqmy EA+IlzLm05yjmauNnBXdWX/Z5R85GWytQrgr+f40MjHpA4FDQnqy8IC7/7q3NkZ6j0h94o/bnkb ibtUrNQQkngryS5TBpbJVFPGofj1OK/ODvXUC5H1RsIkvdJ2oApdXboj4nIpg7JSpQCwR1TXOae fuSHDcotTueVUMrGjcDyNCGviBLNES+OAudzRx/giO6zZw+RWUj1cdkACIinOt8DbohNvI35HBZ EexYFX16xsUz6pAJX2xEL03pUpWpn1y0yA2i/jODUGngxqUjkfjL0QdNqxE+gsoW9oRdz3ICDd8 sxUoowpvO8LgD2Tp/UX1mul5HePpd7n+nqqA/X X-Received: by 2002:a17:903:3bcf:b0:2ca:ed41:d33d with SMTP id d9443c01a7336-2cf34a80342mr208350785ad.45.1784629683862; Tue, 21 Jul 2026 03:28:03 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:28:03 -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 v4 13/29] ASoC: codecs: mt6359-accdet: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:44 +0700 Message-ID: <20260721102600.523199-14-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@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