From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 ED2333D47DD for ; Fri, 26 Jun 2026 06:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454541; cv=none; b=JiVVe2Q7tE+ZbCcr2HxMWSm/0LGX5IeoSLKjj57Jp+s0VxLEThHnbB0svOSJQdMf8tJNUWO0eWEyRRoz9Czvqgd6fuFggJd7MvpJkIKfMRd4h4c4qESTTKrQZ+vbErKKtj589TW7apWBkADTwmLBppSq/VKj6oNnq99ls5+tt4Y= 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=qKNtuAg7; arc=none smtp.client-ip=209.85.216.46 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="qKNtuAg7" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-37c867bd3e0so390317a91.0 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=lists.linux.dev; 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=qKNtuAg775sEee5jOHaLm9LdyTGfJj3YLAX7z2Uhi53c+FL1k9V+lUQzfdBtwQ99oP id81pGhO0mxQt4uHW/0zfIEcqMGSx7YI6KjqaLBAYe9vimtBi9qR1jHUDWfl9zlus4Y5 B3VmFm5K0cMJDfpHyS0Q3viXD7qHpzu1CTC/JCTF447I+hBL9NSq6jykuN+3pbVyD3mg SKYKa0Ofc3NPKwHVxPo5qHFG124bfePlTurMfL26IrurgQaWCNVTKnJIpcgvjoz6SPxa YgQX3UHlCfcpwcREGUngqwF4uNTx+D4sa0CYpvljpTxGaa8kbEsRiTJ4zmrIL2zRBTjW d/Kw== 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=h8XsJ0MyPGiDnzeyZqBuzqNfaQ80jtupgVVJtfYQVPPNoKzoF40tyxCrZJjW4/HfMZ WvNQlxy8B55bsLakpreqLCeb2fXQH4aAAp3gvtXFx1yZEMGMs6zUZXDFY6fcKKMPPrqe xXcQH++HHV1WoQnaS8Kop6upbZJ5zScK1IFAOWzW4pVRMiVlWVG03r2GtPHYtXVoy+9H T67tv7/oXadHzTDldI57Ehkwjn6aA3SxTPi9kZo/Z9ZwAJ2F+eJj088soEs3QlPZmCMW lp2LYvsdEnbpHB6VgQAOo7ystq7sTkI3IvLXVyJoz+/7ixLkZvnnJNjm3lkpdvut1pm+ wzZw== X-Forwarded-Encrypted: i=1; AHgh+RozWhhyJTKjoJCCqgpm3pwfwT0fB/S0uiqaDPyvEzA5LpjNS98rzO2DVHjNKVpV9Ri2pjmNjQ==@lists.linux.dev X-Gm-Message-State: AOJu0Yx4CcBxKn1is6ytUcJp2bPY3E0SWEG9azz6HgcjpowJhN4IEPOb Elc/GvHMj/g1vj8MMggqJYbtIhxcEx8ODv7T1YYnsOv0MIcrxlZH+Tcu X-Gm-Gg: AfdE7cktNDF7nVIDgGr+s9ZlJRE2wOF4HBPZNinjj7pRyeciXZaU9sGjg2CjZguFFKo hiXJVkxiEJ3nlSO/2yifqpDUVw0WXy62/vnU0yNSr4Hw0lEm6kp1Fm+nOZvNjm0Z47ldyodOOwy 5+dVxkr1XrPcb9FpUqgnYLOhTlegGPo2BqySxCoSxCZnaGoQ7WMNnjcMmxHjOCoR7/lR7bwD3J2 HDZUWhOnuCpIvqENFCSp1eSKFmrFckn95nl70fhs7kuu+ONdMFzZhsNddoXNf8DwNdWirmSzaZA ZtkyIdQp5SnGyQDhPJlNGWTCx4Usk0LztLb30Q6NaxsBBj4YFbx7awRPRuiwM1r3AIBAXzW335j e+FQJY71Mact4fLwJkVX7VumsXuBWnPJtjBn4T+fYObp5VmSxhlHF0tDIKmy0H9xYTG0+nloQW5 m8L4LQK0542vNBqFgwEnYfFUhm+ozTf066HoGomq56hhYhN3c= 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: asahi@lists.linux.dev 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