From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D786CD98E2 for ; Wed, 17 Jun 2026 10:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U1QeGLnTyUL0/QJF0HVH9R665IeUBRSb9Jie1YUIXrk=; b=raG7csdkzwCEYaPUuU20jqap+D ZjWuTDHpZGtU34RXQmC+1Sr+F8FvdX6Ht/tbrbOCflFitjtLhmgmgHAa1Poh4bkb/9hZhaJLRS2tJ vJxt/GkDkVBwQw0FEqjW88bsNQphDDXpx8VchzyAm0EI+mWWrf+lu7uVGj2AnZw8cJyotekBrO8iY ZPdNeu1ROoqBiw5IyFmyZ/xaBy8DzK/KtYM2Rew28qHJGmhkJ/HOtSJJogzRXnKkZpclxakY3Eatd S+NG7IwDUPIxnHcWxscCO+wdneXuf/9Be8XC0Lvo/05CcaiTciEO5kb20XjphTAgyk8zdYizZAraW c2ygxkng==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnbr-0000000H4y9-1Ekg; Wed, 17 Jun 2026 10:35:03 +0000 Received: from mail-dy1-x1332.google.com ([2607:f8b0:4864:20::1332]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wZnbo-0000000H4va-2S7H for linux-mediatek@lists.infradead.org; Wed, 17 Jun 2026 10:35:01 +0000 Received: by mail-dy1-x1332.google.com with SMTP id 5a478bee46e88-30bd47b9f0fso480756eec.0 for ; Wed, 17 Jun 2026 03:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781692500; x=1782297300; darn=lists.infradead.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=U1QeGLnTyUL0/QJF0HVH9R665IeUBRSb9Jie1YUIXrk=; b=Fz0MhC001KZTxfsa4BLPJxcAnyZJ8Q5S83ls+rWpf6KLtWYCq5H20Kw4tBBD5h0P/b 6A+OcC+hC7YSRGgiROwhIjTiDSyQIdVNR/KZmeSu0+geE5M2YTvAN2ROi9fMyReb8hjW 0LC0d1mrL9Kkohe0uc8R47kwD2SR3G+20+JXqyG8rTduYMDCY+wNH1dBNcrV8/4TxrQP PNs5YB8rWKqxiyOOMHeiy8MoE78UMR0inU8UMagMcOtTY6gupIqMMLQALYnpTWBAzQ0B FuT1jmBkg+gc4KYoY7wDbjTOF+MlbDvBsbRZVHiHQhZyOUfJt/8pHp8Ko1CuuskQnS4G tFbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781692500; x=1782297300; 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=U1QeGLnTyUL0/QJF0HVH9R665IeUBRSb9Jie1YUIXrk=; b=dQDu/hYlFhlIUnT1X0fEtNIyQJHkQDncgD1953Mjw0XZV/j4iPbe3dMaMd+a/lirlS tujGtqvZ3yzyHb4jX6YgVL2eZK1cvJqjxVpyTpNRujrHdYENyuP203uLSIqWW8ISQXxw iG3O7YNWyPo4MeVyLJDah9tx70AQM9nlYOtVD9tnZE3NsSNWVDGzQj4JfUk6RpKbD5kT hJuEKIxvYlMZRz/V+einT9uffiyAK5SbFOn6c7S2Z1PpOwrOTBuk/orDlCcRB+NZR6/T 7G9lFrfLRI0VXlocvv4E9G7uc5WL7objuQudsSk3E9AQJiqqYFs7aqIMI0hje778DcJO +nVA== X-Forwarded-Encrypted: i=1; AFNElJ9VseOUdFyVCnXycE1vKu0rFzzTyTOUHqRdIkHdCRA9fv1/yMYrVRlnyJDt1KOQdGpFReeN3kwuWFnl34NAvw==@lists.infradead.org X-Gm-Message-State: AOJu0YyDTuDWk9lKoNmOmUYepQ4ncK4CT2xrfTY79uJc+gwR4hPDQ0pP NT2LqFjqlJiTFpdGMWzfMHCAB+ZAJx5G9Us0/s9wrrPwQ33uuSmQinUh X-Gm-Gg: AfdE7clME2aTZ1damBDotObe+wUZoLZGRjsV9m28NmZQU/+gAOiMSNHlKCt7oJcoJ1g DKISVBqwUe4YZ1vbq4VrvUNBZKQbg+HcWhdyn/ziWw4RS0EGVInl2wzEOplyVR0Jr0NE2/sBUlr nGnJMBK6yHEZ+a9mrizMfSpQS6nN/bOiKOt2nTTSy8VJ4MU5YS68wZ7TdnQh6abna1mHestsaYo r+3NAqZrG7MRfyEzHNzAkRv81ZWGMr3XSdSrczWdWQBMRHQjLoeZmIox9bU9VPzalWUIb0DcNzX F6K1xg4PfdXys25ib6svKx5doFard5AXq5aNFDCkVh4Ion1+jpWkWwywgecTcTf2mWiJPRbWj+D JXDBqnfxo3dDPlMIfcchPI8CDO5ezq8yMybbb+kTC3PiAhx/Z05OTs91oTf4PdKtFAP67hQF+j3 P32gBbmSZWO7LlBll4TPoojUKIBjoYGFlbIRU1vNlRn413Woc= X-Received: by 2002:a05:7301:7c0e:b0:303:f295:4db2 with SMTP id 5a478bee46e88-30bc91d96d0mr1569188eec.0.1781692499885; Wed, 17 Jun 2026 03:34:59 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d0828sm24616275eec.10.2026.06.17.03.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 03:34:59 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Cheng-Yi Chiang , Tzung-Bi Shih , Guenter Roeck , Benson Leung , David Rhodes , Richard Fitzgerald , povik+lin@cutebit.org, Charles Keepax , Support Opensource , Nick Li , Herve Codina , Srinivas Kandagatla , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Lars-Peter Clausen , nuno.sa@analog.com, Steven Eckhoff , patches@opensource.cirrus.com, chrome-platform@lists.linux.dev, asahi@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, bui duc phuc Subject: [PATCH 13/78] ASoC: codecs: cs35l56: Use guard() for mutex locks Date: Wed, 17 Jun 2026 17:31:30 +0700 Message-ID: <20260617103235.449609-14-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260617103235.449609-1-phucduc.bui@gmail.com> References: <20260617103235.449609-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260617_033500_650830_3C21ED12 X-CRM114-Status: GOOD ( 16.27 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: bui duc phuc Clean up the code using guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/codecs/cs35l56-shared.c | 6 ++-- sound/soc/codecs/cs35l56.c | 56 +++++++++++++++---------------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index f14e2eaaa4ee..6cb835a5aaac 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -645,12 +645,12 @@ 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); 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); @@ -692,8 +692,6 @@ irqreturn_t cs35l56_irq(int irq, void *data) err: pm_runtime_put(cs35l56_base->dev); -err_unlock: - mutex_unlock(&cs35l56_base->irq_lock); return ret; } diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index 570a68829ccd..98ebf38c9bb7 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -848,42 +848,40 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56, bool firmware_missing if (ret) goto err; - mutex_lock(&cs35l56->base.irq_lock); + scoped_guard(mutex, &cs35l56->base.irq_lock) { + reinit_completion(&cs35l56->init_completion); - reinit_completion(&cs35l56->init_completion); - - cs35l56->soft_resetting = true; - cs35l56_system_reset(&cs35l56->base, !!cs35l56->sdw_peripheral); + cs35l56->soft_resetting = true; + cs35l56_system_reset(&cs35l56->base, !!cs35l56->sdw_peripheral); - if (cs35l56->sdw_peripheral) { - /* - * The system-reset causes the CS35L56 to detach from the bus. - * Wait for the manager to re-enumerate the CS35L56 and - * cs35l56_init() to run again. - */ - if (!wait_for_completion_timeout(&cs35l56->init_completion, - msecs_to_jiffies(5000))) { - dev_err(cs35l56->base.dev, "%s: init_completion timed out (SDW)\n", - __func__); - goto err_unlock; + if (cs35l56->sdw_peripheral) { + /* + * The system-reset causes the CS35L56 to detach from the bus. + * Wait for the manager to re-enumerate the CS35L56 and + * cs35l56_init() to run again. + */ + if (!wait_for_completion_timeout(&cs35l56->init_completion, + msecs_to_jiffies(5000))) { + dev_err(cs35l56->base.dev, "%s: init_completion timed out (SDW)\n", + __func__); + goto err; + } + } else if (cs35l56_init(cs35l56)) { + goto err; } - } else if (cs35l56_init(cs35l56)) { - goto err_unlock; - } - /* Check if the firmware is still reported missing */ - cs35l56_warn_if_firmware_missing(&cs35l56->base); + /* Check if the firmware is still reported missing */ + cs35l56_warn_if_firmware_missing(&cs35l56->base); - regmap_clear_bits(cs35l56->base.regmap, - cs35l56->base.fw_reg->prot_sts, - CS35L56_FIRMWARE_MISSING); - cs35l56->base.fw_patched = true; + regmap_clear_bits(cs35l56->base.regmap, + cs35l56->base.fw_reg->prot_sts, + CS35L56_FIRMWARE_MISSING); + cs35l56->base.fw_patched = true; - if (cs35l56_write_cal(cs35l56) == 0) - cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT); + if (cs35l56_write_cal(cs35l56) == 0) + cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT); + } -err_unlock: - mutex_unlock(&cs35l56->base.irq_lock); err: cs35l56_enable_sdw_interrupts(cs35l56); } -- 2.43.0