From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 7268744CF4E for ; Wed, 8 Jul 2026 12:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783515141; cv=none; b=g7+1qzmGK++9Vnd8umrnlI7n1tx/4euJdCNfzDSb6yxotLS8fCYB3pDqvv55W7+ig25Ry7Yx879RQcKtZn0a1jhikyNEiRIyQ9JgBX+ndvkbShsIxbnAtFztV3kcaleuyA+UPqi3vaui9Z/0xYt3mc62vIJN8xaJVaFxbC5XjQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783515141; c=relaxed/simple; bh=ViT4SAYQfWPE+1atmk7kb6K9XAwGWWkC6cl6Dp13LeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WWufa/r/b7CzEE/+ziLeOfIv5+/D1Tplaqwhm782EBiON5R/Chgc50Uu0CD+oDfvbwjWIxDbXJQAGbNMyoAOVAR5vfNd5LEdauzIt/0pMn93GHrhfqGZR8F0x2OVb9I/J+3jlljk76xItgB3I69pUpt5W23ZQeMRLdegz+YpTnc= 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=V69TookQ; arc=none smtp.client-ip=209.85.216.43 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="V69TookQ" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-383b4a3755fso641187a91.3 for ; Wed, 08 Jul 2026 05:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783515139; x=1784119939; 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=GELCOb8jCO0gF2MBINNZBC9gUyxB3/zkC4nOSWvZgw0=; b=V69TookQym+qoGGgLM+07lYC07W0gAk1LC2eRE2LWksmZl+0mW9WGl18L49bPSk+AR Z24FAHmSKnZ+ymoZLqQjR5ggAnzYTVDi3BS3KlStjGQf24cSDPrAWkNNkh6zdoOOxiTA scNdBdRgL47NTbA3SMjuqk4dNYT6VwQesCAbgXG6i1PfnMOXzTE72EA/vbWep8+yR7Yx QQ5ux742eZZ4ryb/cI7vPIfWXSqvmhmz19X8aQ69VFgZThLOkkD53iTJ85hdR9HpbEdP TwogW3gltozD3Ta/lHKd9EkYevVELiWirWr7rDov58kOMFAl13iDKq4hY5Ora+VfSSlV d50A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783515139; x=1784119939; 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=GELCOb8jCO0gF2MBINNZBC9gUyxB3/zkC4nOSWvZgw0=; b=alMNCAqkAjmQwVBJ4m2EDGtCS+b/qD0VbPoZTr/aKv2r617puGFjN8pqv8ZICaLwqC wTpAAnOEnzxjIbtsmLug0wXTSbbv72oqvNjQyqn63iZ6j+kZfjDaHioZuWBbHWAMRgOI tTialAnDKPevByFVVU4RjCaDEA8GB+iW5joH5qRVtQPNcsQhPsiVyl7Nk0QnPyrdVcwb O3VqhA2tLn5BmpV3OEUyKwxfMcOkgA2pNxTIwrT7j4hH3vQsm4WBHBgWgkUwXe3sa2fR WJh6OkTrHiaL2r7Vvf1JsnipXciRqWWTIYYPPMAUMx7r4UnnU0xFIVbraMRu0N8gORUo 9zMw== X-Forwarded-Encrypted: i=1; AHgh+RoU9ViXeWKWqimpJhyl8WHwzV+U6K4h5rcQeQk24Ku0OiQ4K/tAOWSQ1cN+5Oy72yf6UkdVWqHdOy1dAEk=@vger.kernel.org X-Gm-Message-State: AOJu0YwdSuFPoBiaWPe9m0eu2IHKTsZRqu9v8r1uQvp82fA99XoB3oz9 mHBNh2mobg/TRtXGLXbMqinyNdQFZhRwC5N5x++D9qZhAb0jh8FcePg8 X-Gm-Gg: AfdE7cm3l+Foko8LSG2YPVorIDwmInfYYzmMpBgNnIJDS3/HwXjQvCeLKoX1jjgyLLw p5RYu9S7sRuSxrZuBrWiJfhr/hZDaKvic2znFmAi7VHLgPI7hsHY9HZhFapFgexbAEwzzoaAagF pr8FielanwcD0pio18l7avop6qSgqtranvQxK9QocDrO78cfwIgEiRLpxebj5UCqER+B1qJs3MU oo1g2kLAWtGTw1LrTR58XlVT0CQF7006jVFyhhogJABY40HuBlDVNSRuAKtV1KR7dP/YoCaKJ7f iAv3p9bpP+4gS50MUqUbKM1qL5jjXq+lT+NPspPOCJ9tlB2A04hEqrf+UbVjvWQHlaYM3+Cntk9 BM1EaP1c5qfO47HYlL+v0L19A33qRqOZQrg0d1w/iIU7C3XAHBnQPsOY6nooZdzph89apTh6CbQ pGXhnM7oTCyfe1fddsmuDOeCXpl988m1yXqQnC2YSqGKZaD/g= X-Received: by 2002:a17:90b:6cb:b0:380:fead:448d with SMTP id 98e67ed59e1d1-3894053cf94mr2762730a91.13.1783515138729; Wed, 08 Jul 2026 05:52:18 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-387d20a2f2fsm2784349a91.13.2026.07.08.05.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 05:52:18 -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, u.kleine-koenig@baylibre.com, kuninori.morimoto.gx@renesas.com, christian.ehrhardt@codasip.com, Linus Walleij , Arnd Bergmann , Sakari Ailus , Thorsten Blum , Chris Morgan , Dan Carpenter , Marco Crivellari , Rosen Penev , Weidong Wang , Teguh Sobirin , Val Packett , Luca Weiss , wangdicheng , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, Cezary Rojewski , bui duc phuc Subject: [PATCH v4 14/24] ASoC: codecs: cs42l42: Use guard() cleanup helpers Date: Wed, 8 Jul 2026 19:49:51 +0700 Message-ID: <20260708125002.202515-15-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260708125002.202515-1-phucduc.bui@gmail.com> References: <20260708125002.202515-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. Reviewed-by: Cezary Rojewski Reviewed-by: Charles Keepax 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