From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 F0F84480320 for ; Tue, 21 Jul 2026 10:27:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629646; cv=none; b=aZVdCo0rfsVspv1hy9qURgQTN98WSth6v21MmQIVbaa2+5OCVoSbPyzSr+/U/bQOd7QK4S1r5xJyrzDEmmnb6f7Ayxwh3xBBNi/Hf0kwOj94FU21VeI2Q//mVMcShO+0eYxWJ4UYjw/49yh1GnVRCx83Wj7Fat3LPijF5U+2KSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784629646; c=relaxed/simple; bh=+nT6I4Pca0g3yL9/0MMMJ9eU5lzYcdje8+rHxYbR5Lw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q9N9iWeBxbsZxMNfhKXfeQMKmhpeaSqX5EJPEYOVajHtnke5mFu/yMsQHzkrC5ehLuGtgH3ZWdsdZLfUQOO+Vd5c2Y+ASoMP2wZAlXdX/2PI+/A5iyplu9V8BZ8hQuWREstONrPhFVn7UsHwGYYwdR3f22P8uQnMc6cTh+/dwPU= 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=eFoQjan+; arc=none smtp.client-ip=209.85.214.170 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="eFoQjan+" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2cc61541f8cso56978645ad.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=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=aUrf6Km35HLEs48Iv+5EKVZGrilhk0m+5i7bYMdUoc0=; b=eFoQjan+ikwUs/ccAbbQBys2VDdM3ywU/GCJ0N0lenezip7V+kWCCNOM35p4Mf0Iwo SrlX+LAiActEIJn7OdZGo0Ahz/bYxb75eI0/WKXKohDWdLubTDvH/769cSfPe3wdY0S6 q89RwJaec1g36m6MzBdfuzLTS9k6wNUa3XOBzOtH1dDUtLBOvkU+K9WpefLbDGsv9+t7 TkLaHRgZGnr8l0uzfOE7tjDybzsFfIoX7LNnRRGvQXbBKQSetJD6BzYLC3u3yXiQhsFr rv7tOjiBwtwGNYHeYKGAp+yvZyVC5dDWF7BKpsM02Ex+zjlw4Aapb1oYaWIIhpdq0SzH Lbhg== 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=GSPmBSnlEYcbWeXbXUY5YsRjFNI7B0V52PyhrUGkGauAHNhTATvLGrd6A6xux03Mn/ i49tdkgDykPxjErHRtpRhliFyzfeO9wW0Kbq28QJ2SOHLrct22RTUw6KviPP+ouvn9Sk yZelzIlfrOOJuuQw/0DaDZw5F4u/x068eIk2DDJtP68TcREjC41wkj/bpdmNBm9cb1NO 6JqF6+wStXYQZOckSmbGUovVD7X8otYXsdkzvR356Jtb0PqeJxA9UmSf7yfNyCrQfPLF fLMUFKs/ag6AJAVDPd6whMqcb/Ja9vPttlg4ZY8e3GPfnWSmNvhkYrSsGrqrNhDeMOEq 2lwA== X-Forwarded-Encrypted: i=1; AHgh+RqBPOokJX3P0m51lZhtY4/Ej17wSiCC1IypCP2m+tV8wY3mHRoMAgu+u4t1tY+k75PcGTb3N19rjMWv4R4=@vger.kernel.org X-Gm-Message-State: AOJu0YxDLGh6ZseZbcmDwK14peKMv7+tZqfyIvMg1UujnGE/JsYfC4Mo DYHGKKfvfMEJ4QLft5cd0e0bXuE/TSG9zn5zBEd00I5afWPch3oSsBYG X-Gm-Gg: AR+sD11mbhfsbPLoBWHdw80UcxIkXBfo1kA2jC11Yi411XYzloR77+7ZurWP/mamu5o cX4a/Il+5MbxjaYwKJtRIR5KGejIERBVrInkTmA3VHMteG7Agz0oD9LxsSPForEeZrOd192VtAU 2G80TqdcBy1s5RY46Q8gjJpz+03t4NSDI/jfzv9NbwePJNWv7rSb1qJwQaMXjZ4rFPE4YXQy2Nz VtcXdZMVLJZNI6zFpDa8xpVG8Ko8hNGZnhqxWus3UfLtVR79AXFal21D7IDOGxoOgPpLGxeCb8l GqJHYkt5EGbS6nkv/Ym1KfkqAqn6DZUZEWnRLqJctztsqOV4JqQ40rCxblaUfIosnaMHvJ0TkLF Kl1wM6Ypb2vhLy5Wjx2e3rlUl6vxfzGxkL6qiu0TDYWxbHHva/65DgN+7b6nuhcT70iGTyDtR8V 6My9O6WxTHn9tlSBH8HyYU0WQTw6ABM/VaC0HU 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> 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() 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