From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 86C8F3D3CFD for ; Fri, 26 Jun 2026 06:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454535; cv=none; b=Hikcq0nSNYfgBGtDpYRMNnnqGXKEMOXSYGrWht7R+CGVCmC9f2eR81hriCWmIZNQM2hSSA0QhVjZAv86ULkVrPrMeJGVFxrh0UthWT76sgzOJjeTqNUs4vC6aonrHdevP19RZToA4u6ZpmyY00sE2GykJQSbM3T7m7PwbpkU91U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782454535; c=relaxed/simple; bh=WYggS4ZnMt6fzQmOJcSRrkDc66AvTs7KIbRAtBpTltY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M5qZneZyJ1hOMLAN8w9JTO+T07n3EewRD1cBAakkIwVqifQM9PPugHUy6j6Rs4PO6YxewWYFJLhA7NH5ORRqa7CIsikp/2E5WQzxdjO4Yl1wx5m6Gt28/ax+8LL5dB5AqRRqqrnT+sdhX/xnUWH8bbt/3AfWEDUWrXRRMZILJI0= 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=ceilmuzY; arc=none smtp.client-ip=209.85.216.50 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="ceilmuzY" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-37e0d09be07so426417a91.3 for ; Thu, 25 Jun 2026 23:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782454534; x=1783059334; 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=YTbk3qG2turaWbnOrhzIgpcLjXYgFFUDaRvJ6ZSqU3g=; b=ceilmuzY9WCKxwzGT2XXeTgIL2qDPcoqC0Y6OZKplQR/OZbPBTXsojuuC0gVQQfjzy 0JCwH225WX3fb4uSb1rXjIaKwPRtj5JU4Yox/NNfhXFH6847HpFREzry9Va75TliPFFS lMn8CN4h2IqelST85mfpBB8mQSPqoxTnLKz4ujQujBstidB2ejkfh6xJc/RAuXQvVQRJ tbzDh5AbrBBwolHfGuh/O/sjftmVjQjZX3orNagvFnLLSy9x1uTz3ClpRKLDx7jMjV5D qzxLHECAps0TmFF53sgiNDO1WxJaEYrGdM4jjFon9pXWIyMq9Fwi8JIBgHDvQfbGIPAq qiXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782454534; x=1783059334; 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=JqFGTgoS4RPf3gLkmW/Xk4ZkkwI2L1JprsjTT46RrOgRIiO/VFJ2rLCopj/klYoZyS aAvmAjidA8NkjJvhuShr0MvLQetta/r1Dw/XRnZRY/IJhDaZDvJDKRWXeTzRTOYm3EpJ oJhNuHuH9Xb6TeOB6kx7Xl4/dpg6f6EzlH3xsuuK7ajzpt5Z19NETifHJ2fOrunUJ6Zq 0mptGnK1QNGmmPruLriH0FSNSAqD2ZBnr0+5aeper62RHkDO/g/BNF1weCXdpY8L6xYa ait9uvgt0BbH8GO0DSGc93DdaCQHi5uhzU8sHmhAd0Tgs4ySfZmauE4i8IkvbEY2V9Lm oYhA== X-Forwarded-Encrypted: i=1; AHgh+Rrv4he1fsZenL95/j7IRkRorDXzEKIrdQNLrtxhlyCGJ0KIvw3ApLtRwy1Zt4PjU6GBDPgjrZRSYXxcd3mzM/4=@lists.linux.dev X-Gm-Message-State: AOJu0YwnxT1XH9GC8GjJ5EAhOszYisChz4R5a2kta5BQMmRsuKazfMPO XS9EX5FiNhYSuJdrzXeY/Y5oE8XtrDM5FbvMnGRyq8zXmExy8YzRn8Pf X-Gm-Gg: AfdE7ckW31LJE2mQZ5iOjKInEYlKz18JOd1+JW9z35h5TCmh7lJjkZFmGfG1O24T/Id Bv7tPcztlQSjJRwoD/7f08Nrq8r7BDYzRl719/9/oEC9QODPA4E/Qmrexz33i4jl5mIEGqFsa9n 4/MKA3nMpH+Hgf1KO0vGcNgHFsN0DWBO7UnXsIMyd9ddpFlq4K0MtoCdSpGgNb2VOSWF0G6U5bk gnodeFfijocZIF63wfAbiTfs32Bjm6dDAUNsEDlRrs6OCiGarszX8HuIIRoBAzIYZHD3YRM8WMb hvC+/Djtytao40IE2T7KkO+6htY6xx+9u8QF7NclYTIqwzeO90n230GCRb5TkM7HQLfvoBRllcE xu4lmTjOwS7sy3xdF6MEWy9Sz9gjWA+BneFkEtvvekbJTgQRer1ioIefjE0rUy/mltFDy4ES+Br ihYbmyqTmKdpjvmOwMpP1GyosI4ozwGc0veg+mRHO4xCsQAcs= X-Received: by 2002:a17:90b:384e:b0:36e:2106:ded8 with SMTP id 98e67ed59e1d1-37dfa28bb98mr5727342a91.25.1782454533622; Thu, 25 Jun 2026 23:15:33 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 23:15:33 -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 13/24] ASoC: codecs: cs35l56: Use guard() and PM runtime scope helpers Date: Fri, 26 Jun 2026 13:13:18 +0700 Message-ID: <20260626061329.23264-14-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: chrome-platform@lists.linux.dev 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