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 5298BC4452D for ; Tue, 21 Jul 2026 10:27:32 +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=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=PjFTFFkYNB3cDq+mebO2c/06Vc 5HFlk4dkT9V7ayRs/lnJLNrQcKCqTAsxqvqpdBZb9OOX1YooF5NAs7wXwpPiYUuP+baMwk+j3nxVH MUIfsCLgv8hZFfCnD4VYgMca/RWIhJRarrqlsoVNXq9KhzZZLvyq/z2OT2jRsQ8aVxxuWr1hH8JF1 EAMFLqTPsjXQrv96e/9yioDiOCaeOnBljqGE4HhkMUEKnLGHr/1IDIDP5UjJHGIEyQV/CkRNhsQ3m 6kqZW57JIOspH0274HLuQ/ChAcBZMCILDBbhsrDJESd7Q3hMvEy3RdeAkyG13VrAjKnGWyKUf4few vzxDY0mw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7hD-000000098e7-15ZW; Tue, 21 Jul 2026 10:27:31 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wm7h7-000000098Wj-0qg0 for linux-mediatek@lists.infradead.org; Tue, 21 Jul 2026 10:27:28 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2cc61541f8cso56978635ad.0 for ; Tue, 21 Jul 2026 03:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784629644; x=1785234444; 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:content-type; bh=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=D5HcPnvXCyY/n3Y29KHxHgksLHF2VC3DOibsE0vdPCOXRpHSKl51+yMyaQB9u1L926 uEWfwwaPqCi6w6uYj/uI7EVAjZfqJmzM3D27NNf7F+r+LXHFspYYT9tuLcSqZysV6+Kg qXOOidpXLVjGqEugdxXEKkNwgjcmu//rHO/zVm9zxWPszcHGAYu/PfWfrN2blMexk8gJ dQMCPhTlI/SZ3MZx6gquPSO/x4l89aagaMsKV/ZEOfkbgIcBfn/A9oNEqM95RN6cZhi7 hkOeLsYCGSYlvOh2nAjB7tK6rIMgtcYXf92opTUJuqUqckc2/2MmErrZKckks1Ol9P/D Ha2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784629644; x=1785234444; 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=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=GZMtzXFNPI9LycGvUy64XxsJgcpRUvBySIikUVLK2Keu0jcLtu587SB3NFTtcWio4R 0gQLFjtRzP1k86EApDWQToz8unxHBTHqT8KWF4wFYVht0c0LSD9ErkCgPJ5FYwa/IBbj PyoIWCQ5Y8T3JcamaGLHN2qbS+XQKpABOZ5vp7j6oY/MZd4adgFDdhGe/HKdJcRA/rGQ yE/1XJWV+yGPnEin9spqRA/XzPEQ9c2Q1mSkzzyy6QniXCFMCDzyP5PrmY3GBPst7vXj oRAAaVBGPbg5G++WVULxqq/8npyf051bKW6jrYLSsMhyRVQ9rVfKJGXaItm8YiWndAcS wzlg== X-Forwarded-Encrypted: i=1; AHgh+RrMFFcVCgSMpuajuszaEn4VBQhnMbgLugdUEK2j1+/KPOb0qTex59rlEQLd+EkgwfhqWCl0WY/q8d3UUcNi/Q==@lists.infradead.org X-Gm-Message-State: AOJu0YyGp9KNO98Ikvb+DUjNLjInujRcvtCp1NeSJ/WZb13rVYmcdJkP m3TzK3WEWlUO+zxSrs7WzPyBxCXdah1ckk7p2OcZpngAsZb4WJ8ETBVS X-Gm-Gg: AR+sD10NTFfarrn4XtNpryce58W4W4KNbMcl8Ku8M5kWlx8+SZCZHSoj8t0HsLXaz9j rSq74bzDVzTOkaOl/4N4B63T7cJazzQVvSdHAvOgbK7SH1ylo+cM13HmpMt0oXpGZ6mMWEE70/y rDW3VlgZnlUQAYJBovEO6jToAdh/p3L+vozrkxN/bK/PqE6WKPa7w0QSHOQ3/GpVXls6+F+zOSg bWVLzZacIBlixrhR15usx4BKh4NlN05fuXoWRYKKmDrb4mKTTPCb0YP/c8F4cRDGxWcarHokoyg OVYR6xu90ZhOsuwpiRiDn2CUMa4MluYneKEjEOqB5rQ5A1U/Gs2o+dO9WulFotJzP/h9h20Wtuj 1zVr7Z+wpiedAF1SzU0DfztJDPfy51vCY5Fi9Z8RN1udDMZRbPMjTpxBwAn7pyPeM6fHnU2CXrE t/OJJtPGzIN9Pf404yVC/ItRNEz1laG35T7+XB X-Received: by 2002:a17:902:e885:b0:2ce:d958:e3b with SMTP id d9443c01a7336-2cf1f570c5amr218336625ad.25.1784629644219; Tue, 21 Jul 2026 03:27:24 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf3448dac2sm73581365ad.3.2026.07.21.03.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 03:27:23 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Takashi Iwai , Nick Li , Herve Codina Cc: Support Opensource , Liam Girdwood , Jaroslav Kysela , Srinivas Kandagatla , Charles Keepax , Richard Fitzgerald , Matthias Brugger , AngeloGioacchino Del Regno , Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Oder Chiou , Linus Walleij , Kuninori Morimoto , u.kleine-koenig@baylibre.com, Zhang Yi , Marco Crivellari , Kees Cook , HyeongJun An , Arnd Bergmann , Qianfeng Rong , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bui duc phuc Subject: [PATCH v4 08/29] ASoC: codecs: hdmi-codec: Use guard() for mutex locks Date: Tue, 21 Jul 2026 17:25:39 +0700 Message-ID: <20260721102600.523199-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721102600.523199-1-phucduc.bui@gmail.com> References: <20260721102600.523199-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-20260721_032725_248426_61819E42 X-CRM114-Status: GOOD ( 11.75 ) 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/hdmi-codec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 13ae9e83bc21..bc2c22436ba6 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -4,6 +4,7 @@ * Copyright (C) 2015 Texas Instruments Incorporated - https://www.ti.com/ * Author: Jyri Sarha */ +#include #include #include #include @@ -452,31 +453,30 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, if (!((has_playback && tx) || (has_capture && !tx))) return 0; - mutex_lock(&hcp->lock); + guard(mutex)(&hcp->lock); if (hcp->busy) { dev_err(dai->dev, "Only one simultaneous stream supported!\n"); - mutex_unlock(&hcp->lock); return -EINVAL; } if (hcp->hcd.ops->audio_startup) { ret = hcp->hcd.ops->audio_startup(dai->dev->parent, hcp->hcd.data); if (ret) - goto err; + return ret; } if (tx && hcp->hcd.ops->get_eld) { ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data, hcp->eld, sizeof(hcp->eld)); if (ret) - goto err; + return ret; snd_parse_eld(dai->dev, &hcp->eld_parsed, hcp->eld, sizeof(hcp->eld)); ret = snd_pcm_hw_constraint_eld(substream->runtime, hcp->eld); if (ret) - goto err; + return ret; /* Select chmap supported */ hdmi_codec_eld_chmap(hcp); @@ -484,8 +484,6 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream, hcp->busy = true; -err: - mutex_unlock(&hcp->lock); return ret; } @@ -503,9 +501,8 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream, hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data); - mutex_lock(&hcp->lock); + guard(mutex)(&hcp->lock); hcp->busy = false; - mutex_unlock(&hcp->lock); } static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, -- 2.43.0