From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 CC1F63D3CFD for ; Fri, 26 Jun 2026 06:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454541; cv=none; b=aHEPPiWdTwEJzIMx8euLJspby+NiOYxF2ZgSbJm7hPp3NAdTML/tWAI96dmpx50hDayaPB2t1U5IM7l0ycvA7VTvppV7tIZmG5ppeXDmxUYB3Yrte8NWpaqrN6xNXNjmAZE8+id/tErX9IgDqTY07zdozItn6Hgd+wbb7L6Zk88= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454541; c=relaxed/simple; bh=cT9xGDqUyMmrwWd6UQHCUtPFwxrEinaHOVCQznucHX8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WsDas68sFyZXkZ6TAN6bwfdAAoGpNBf/KB+iTBA6bsgvI8qSMchLUy7QcGWKPbe9xK/y9MnDWEumAMGqj8c9pSpwVk2DuTuSyEsj9LR0rMuGtdjXDdAhB+LcAiL0r9wyde7EGEXmGVfd5Dcibe36WFjkbG9pDQ+0myX3FTASZu4= 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=kUORSirf; arc=none smtp.client-ip=209.85.216.44 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="kUORSirf" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-37df416c45cso291845a91.2 for ; Thu, 25 Jun 2026 23:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454539; x=1783059339; 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=XRPEnghfZxq61StH401AduhkEbIXz0HOJx6uokYCpQk=; b=kUORSirfsNpEe/zOkscoeQU1hxNt4np8Y5e33nKysrw0baK80N4AFPXnsYvYHpqM/0 r4FRCJJuIOFE/RuCHm9+cLkvme6i9G+/ioUJXIu+QC+xzaccilR1L/tZuMnkVODyU7Lu tJfndlyedS11v6jXhHftu+xo6dUidws2T6T/vjbeH09CSkYDiY2nVEQuJ9zm85pK/Thn 7rN2gmEYUgNS34gY6qnyCzC25/NsJoA/4oZfVgB0EHpuRNkwNVM0ASDUNznw2xlf4f4h DO3BJWpYNLWP7yNUes87v6PcqN9YUJM+AaacsnDb0rCguMLt4vTjIo+jNuJitqZqZ6oC N19A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454539; x=1783059339; 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=XRPEnghfZxq61StH401AduhkEbIXz0HOJx6uokYCpQk=; b=dERyEkB/WjBq75XIkf4F1AW7qElGuQN3Yx/sxNunU/zPrpunIx4S0quuCYFQE/xkW4 STLb+zZdatvZCjX3BA3YFrVHfCxCCvUAYJBl3HPL8bEpOd7u6q5j5608GdfDtpDjmagD ny/fVeAB8FwHpnIyJRvo05pOEENhO1addWIrON4ltPHeHX7qJZKUWOTpTAh6mzxiwsaQ P2x8dDSOm64NTZR0XlrKpl5Wo9BsJbkPPugtC+80CuEqpPfQKrI51Gk6gjCrpF5Ixyak X+b68IOaPSiraXQ9I8AFjsk2IQcuROgYma9/IOAysFGkd3LtwzMB5IbUCMvwTRDds5A8 vtuQ== X-Forwarded-Encrypted: i=1; AHgh+RraldPAQE6PFkHOywgMuja0HgzdqxoXOkIZitDC6o7cjv+K7gSMYozE+ibXECuzN9Hky1jaZmYlbD6WxV4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5gAvUd1YUriRmivPzxSkYdaaZNAMDVEn1A/89m8RbDoBEtTrm efgb6fx+OYT4y2w8VCX1Nifu2IiIr44YhMKg8Tm5yrmXsx7GdoxUgjNA X-Gm-Gg: AfdE7cl3lcYMwkgjIs+/oJubcUCR+ELpAlqTvK0OxyFN/w5R8DGcTJ1OZ6rRrD/PKqF sv1/9kPJ5C3DuBM+dLMyhFLHZy6prY/r/k36FjgP958i8/U7+ZZ+3VWWhuJgkcwG9HYqPYD0oba /mY77h6eWbwl88vJDOy33pqtpoeKcyxhxrFv0O1a6h7prLzyCblUa96RwCe2NTPQS9KgTi+ZCHS 4uvFAlkAKUzvO5AsffkSEwdWyQ8T8CnIZI1/I13QhZa+s60hTTwzf2CIcX5gVEexbPWd/PBgkit ycwNBPC1QFgKidy9IMbU9BQjr4FAwfqsrmPGqYAexhLKcHIEOJXWSsjE3IjbNbH6A/z2dRPrYh3 QXtk+2LDLXUbpOCNZ15kCeHwyCm8MWQ50d7Pm+Utlz+s7t8GAJA7FHyEnd+KrI4+hIGBD85eYuv T0JDxOp243iATWJyRGA6Ty8THFdt4BCBi+hg0jvos8x8JBNO4= X-Received: by 2002:a17:90b:3852:b0:373:c536:6fc2 with SMTP id 98e67ed59e1d1-37dfa20ee7fmr4985522a91.22.1782454539140; Thu, 25 Jun 2026 23:15:39 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37e12da6ec4sm302051a91.2.2026.06.25.23.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:15:38 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Tzung-Bi Shih , David Rhodes , Charles Keepax Cc: Liam Girdwood , Jaroslav Kysela , Cheng-Yi Chiang , Guenter Roeck , Benson Leung , Richard Fitzgerald , povik+lin@cutebit.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, bui duc phuc Subject: [PATCH 14/24] ASoC: codecs: cs42l42: Use guard() cleanup helpers Date: Fri, 26 Jun 2026 13:13:19 +0700 Message-ID: <20260626061329.23264-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260626061329.23264-1-phucduc.bui@gmail.com> References: <20260626061329.23264-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() helpers for mutex locking and PM runtime management. No functional change intended. Signed-off-by: bui duc phuc --- sound/soc/codecs/cs42l42.c | 54 +++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 2652a639a79a..fadf68860601 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -9,6 +9,7 @@ * Author: Michael White */ +#include #include #include #include @@ -565,7 +566,7 @@ static int cs42l42_set_jack(struct snd_soc_component *component, struct snd_soc_ struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component); /* Prevent race with interrupt handler */ - mutex_lock(&cs42l42->irq_lock); + guard(mutex)(&cs42l42->irq_lock); cs42l42->jack = jk; if (jk) { @@ -581,7 +582,6 @@ static int cs42l42_set_jack(struct snd_soc_component *component, struct snd_soc_ break; } } - mutex_unlock(&cs42l42->irq_lock); return 0; } @@ -1668,13 +1668,10 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data) unsigned int current_button_status; unsigned int i; - pm_runtime_get_sync(cs42l42->dev); - mutex_lock(&cs42l42->irq_lock); - if (cs42l42->suspended || !cs42l42->init_done) { - mutex_unlock(&cs42l42->irq_lock); - pm_runtime_put_autosuspend(cs42l42->dev); + guard(pm_runtime_active_auto)(cs42l42->dev); + guard(mutex)(&cs42l42->irq_lock); + if (cs42l42->suspended || !cs42l42->init_done) return IRQ_NONE; - } /* Read sticky registers to clear interurpt */ for (i = 0; i < ARRAY_SIZE(stickies); i++) { @@ -1774,9 +1771,6 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data) } } - mutex_unlock(&cs42l42->irq_lock); - pm_runtime_put_autosuspend(cs42l42->dev); - return IRQ_HANDLED; } EXPORT_SYMBOL_NS_GPL(cs42l42_irq_thread, "SND_SOC_CS42L42_CORE"); @@ -2163,22 +2157,22 @@ int cs42l42_suspend(struct device *dev) * future interrupts. This ensures a safe disable if the interrupt * is shared. */ - mutex_lock(&cs42l42->irq_lock); - cs42l42->suspended = true; + scoped_guard(mutex, &cs42l42->irq_lock) { + cs42l42->suspended = true; - /* Save register values that will be overwritten by shutdown sequence */ - for (i = 0; i < ARRAY_SIZE(cs42l42_shutdown_seq); ++i) { - regmap_read(cs42l42->regmap, cs42l42_shutdown_seq[i].reg, ®); - save_regs[i] = (u8)reg; - } + /* Save register values that will be overwritten by shutdown sequence */ + for (i = 0; i < ARRAY_SIZE(cs42l42_shutdown_seq); ++i) { + regmap_read(cs42l42->regmap, cs42l42_shutdown_seq[i].reg, ®); + save_regs[i] = (u8)reg; + } - /* Shutdown codec */ - regmap_multi_reg_write(cs42l42->regmap, - cs42l42_shutdown_seq, - ARRAY_SIZE(cs42l42_shutdown_seq)); + /* Shutdown codec */ + regmap_multi_reg_write(cs42l42->regmap, + cs42l42_shutdown_seq, + ARRAY_SIZE(cs42l42_shutdown_seq)); - /* All interrupt sources are now disabled */ - mutex_unlock(&cs42l42->irq_lock); + /* All interrupt sources are now disabled */ + } /* Wait for power-down complete */ msleep(CS42L42_PDN_DONE_TIME_MS); @@ -2250,13 +2244,13 @@ void cs42l42_resume_restore(struct device *dev) regcache_cache_only(cs42l42->regmap, false); regcache_mark_dirty(cs42l42->regmap); - mutex_lock(&cs42l42->irq_lock); - /* Sync LATCH_TO_VP first so the VP domain registers sync correctly */ - regcache_sync_region(cs42l42->regmap, CS42L42_MIC_DET_CTL1, CS42L42_MIC_DET_CTL1); - regcache_sync(cs42l42->regmap); + scoped_guard(mutex, &cs42l42->irq_lock) { + /* Sync LATCH_TO_VP first so the VP domain registers sync correctly */ + regcache_sync_region(cs42l42->regmap, CS42L42_MIC_DET_CTL1, CS42L42_MIC_DET_CTL1); + regcache_sync(cs42l42->regmap); - cs42l42->suspended = false; - mutex_unlock(&cs42l42->irq_lock); + cs42l42->suspended = false; + } dev_dbg(dev, "System resumed\n"); } -- 2.43.0