From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 35CD035E94E for ; Fri, 3 Jul 2026 05:56:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058189; cv=none; b=n1mVnHkRR4Oh0gH5nSq5YZ2Zv06HnL/28SbFP3ivtXuE0IHKXFLqgbspdGzR8m8ZsOitzumA7L98XDZ3/WpabrBASCtnF/ymKCIp4UWgj9/hwXrLOXnKh6So94Nr3t+S6HBBsnGiJJgkxgz79hxsQprHVPjHP7WQ2an9fdObqE8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783058189; c=relaxed/simple; bh=WYggS4ZnMt6fzQmOJcSRrkDc66AvTs7KIbRAtBpTltY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dJAZBbu5VEDIaAc09WcO22AjmmPUkRnkS8QGkEXVGRtF4eQaU83oWWbjZkSduEwvCE63uGvZZQ4Sjksc3ZZZg8dYqjzGaoUilXH7EnNoKA2JKCxVDsNrIfdi+ILO5Rmm6UB80lpIS2AKLNoYhMXi3YmELJrSwL0mj9XnKRaO4Hw= 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=S0PVtU/8; arc=none smtp.client-ip=209.85.210.169 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="S0PVtU/8" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-8478a25f268so123335b3a.2 for ; Thu, 02 Jul 2026 22:56:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783058187; x=1783662987; 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=YTbk3qG2turaWbnOrhzIgpcLjXYgFFUDaRvJ6ZSqU3g=; b=S0PVtU/8yk3sfCeA8F7GzOUlnp8zWugvx8Mu0Rl7K3VTiDLDTCI8r23AQz1t9zUKdz xPKkQ2G0F6YW0dZelIJfXK0L0McNf6Qt228O1ZhFUNLE2DVivHQOuHLB49ENZSk5YUsy fDReswvRvAZQ/beQM6Qy4PEkq1kg057Yug3C1KSB4woIYro1a9Q3LImF2dGJk+WHiLiM tPTd0ozE0Nhf5IGIf6OpNHRJOaGnQcvMH4otnKPDfThI0QA8HBIXgP0L6Sf4DRVY6jYG utMdRFSQLi1BzCinktvIoB7o5e2AZnSIYCpT7gGPtBH72q8R6ApYOIklanIoSsplfQ3m UKug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783058187; x=1783662987; 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=YTbk3qG2turaWbnOrhzIgpcLjXYgFFUDaRvJ6ZSqU3g=; b=NLaIzV1asQn2rMM0oY/l5Sv1Z2eyrbk0SRlLwOBb2Y+bJQH8fBJlkmEKGqXpSyxGOO uR+mv6E++59sd7BCBrXTwioL1blB+Sbg1a9zRivfDqdu8sJWY2rRWHhgniQL/1N72itZ swu7jyocPsnqj71uDzmpiYix5qTiDSljlv3U6AakqSB9o4+yOJF6GQCjrnkwJUzof/bI IPOt7pUw/ZPnLsfScilxrzOGzeahnNY8psOVEf8KsIhD8b1oIpYm8LLv96Whi0x9uLSK NDBwKaOB19sDKz87VW2Z9Tdz/EkfQJiiRAYhWhY3R469/tUApTbhc0WBotkDmlBDBZxH Bu/A== X-Forwarded-Encrypted: i=1; AHgh+Rr5Z9U+e0V+pJXp/MT14+wdJMEoz8oHqIiZJBVQqnuzxsF08VnguYCsIV6vIzF109c5odrgxTMWyTFr1WM=@vger.kernel.org X-Gm-Message-State: AOJu0YxlX2y8lkTCRZ4Xiatwo8n8Y+jvst1BTl6qtSJb8zo/ikWoyiGY TnIj2TheSKqwvCPmoClp+vrMOVR7IvMg9axkc2MRakQ0kwTitTuwo0de X-Gm-Gg: AfdE7cmcgM4OkTju0MhGhsLLiJ4fMZM0gi3YJ6sw8bCirtA0jyGl7+eX+X66i0/BTqS ZD62TzWSLc/27kVf07aNup2cwXyQeq6zboUqLajrrXJLCU3dwyNVijz9P/HqGIZCF2eVs11HBRb RKovHo7BGDVQUz4ewAcYA7xjDuzaAu4Sc3PQdFdNU8su6oiV6xrEdMa6oPp+JJ3BiSVAD3dRfrL yqjrCbM4GZ7miag7hSXQ/1BwnSG9/j58Z7lpIxvc/bpFxvx6zb9Aja+F2HprGUaUPseVy1PtfBY woZLcIfZ/L0MkzNlXSPaaBmUZIl8bqRsbH0NTqsNVSTHkniFDmVBRJEpR35/WFzG6HARtMtgC3A wA0CiYWuRwTcnbPwwvFLqvtETbRwFPszpj1Dj8QZazaaUqslMIuhi/54vbs10kE71nAsRzYkVVQ LI67VTy95yYV3+RN+cDi8zsitbFkpywgp72+atxm+2QY4AzsE= X-Received: by 2002:a05:6a00:414f:b0:835:41f3:f440 with SMTP id d2e1a72fcca58-847c50428a1mr8169003b3a.14.1783058185595; Thu, 02 Jul 2026 22:56:25 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847cb94b3e6sm2340028b3a.33.2026.07.02.22.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 22:56:25 -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, bui duc phuc Subject: [PATCH v2 13/24] ASoC: codecs: cs35l56: Use guard() and PM runtime scope helpers Date: Fri, 3 Jul 2026 12:53:44 +0700 Message-ID: <20260703055355.244898-14-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260703055355.244898-1-phucduc.bui@gmail.com> References: <20260703055355.244898-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 Convert the interrupt handler to use guard(mutex) for automatic mutex unlocking and PM_RUNTIME_ACQUIRE_IF_ENABLED() to manage the runtime PM reference through scope-based cleanup. This removes the explicit cleanup paths while preserving the existing behavior. Signed-off-by: bui duc phuc --- sound/soc/codecs/cs35l56-shared.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index f14e2eaaa4ee..73fe1cba3f5b 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -645,18 +645,19 @@ irqreturn_t cs35l56_irq(int irq, void *data) if (!cs35l56_base->init_done) return IRQ_NONE; - mutex_lock(&cs35l56_base->irq_lock); + guard(mutex)(&cs35l56_base->irq_lock); - rv = pm_runtime_resume_and_get(cs35l56_base->dev); + PM_RUNTIME_ACQUIRE_IF_ENABLED(cs35l56_base->dev, pm); + rv = PM_RUNTIME_ACQUIRE_ERR(&pm); if (rv < 0) { dev_err(cs35l56_base->dev, "irq: failed to get pm_runtime: %d\n", rv); - goto err_unlock; + return ret; } regmap_read(cs35l56_base->regmap, CS35L56_IRQ1_STATUS, &val); if ((val & CS35L56_IRQ1_STS_MASK) == 0) { dev_dbg(cs35l56_base->dev, "Spurious IRQ: no pending interrupt\n"); - goto err; + return ret; } /* Ack interrupts */ @@ -680,7 +681,7 @@ irqreturn_t cs35l56_irq(int irq, void *data) /* Check to see if unmasked bits are active */ if (!status1 && !status8 && !status20) - goto err; + return ret; if (status1 & CS35L56_AMP_SHORT_ERR_EINT1_MASK) dev_crit(cs35l56_base->dev, "Amp short error\n"); @@ -688,14 +689,8 @@ irqreturn_t cs35l56_irq(int irq, void *data) if (status8 & CS35L56_TEMP_ERR_EINT1_MASK) dev_crit(cs35l56_base->dev, "Overtemp error\n"); - ret = IRQ_HANDLED; + return IRQ_HANDLED; -err: - pm_runtime_put(cs35l56_base->dev); -err_unlock: - mutex_unlock(&cs35l56_base->irq_lock); - - return ret; } EXPORT_SYMBOL_NS_GPL(cs35l56_irq, "SND_SOC_CS35L56_SHARED"); -- 2.43.0