From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 537833EC2DB for ; Thu, 11 Jun 2026 11:59:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781179171; cv=none; b=mtZ0g1r9Ozo4c0BnZ8OmfA0EdJrAYB7Pxb3aYZapSsGAPxyeOzYsJuND7SAw57qbIt/S6oTRqKJ3IiBg8xoPqLChqcxTkVEL6+B8a65bkPnnCEmGBYi93OQzeHMhnQfmoYepkF89YWEQZuuOMZXbNcXTUgvNCIpfl8xLHaPpEOE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781179171; c=relaxed/simple; bh=1F239UYPLIrGy4+qfOtom1X7ZzgTvbBVjLMelsmI0os=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Be82Ivwdo++CrrMPFp8T8Slyl3xtMqKHNIRbm5R4ss06/Mvsx4tmmXCrNE8dyFVz7vSi4Ew096jz2BVbGKvaKQrcRmcQUL0mc85SoN1Fuk/xNccXHM7XlqplQVXGXQnHEDrY3fpm/E3gpCn9pr3MAJ/CDaApPGH7G8k1bp4e1V8= 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=aaairMlD; arc=none smtp.client-ip=209.85.216.54 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="aaairMlD" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-36da8439078so6854810a91.2 for ; Thu, 11 Jun 2026 04:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781179170; x=1781783970; 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=1LGwl9Ca/ahgzdKu9eaaXl5zm9WU2DHHXPH7cdDgJKE=; b=aaairMlDY1bEeCaBzCoM0LwiE6Fop345SP3lX9criavKfMQznBpkzVuOcflqaq9jRO icgUH81q6bj81SWbUBoz2zWeYUcqIkEbUUA+jRKqclthUGyNwGiViVY7FS1/ruZQQ8yR m45r/ml11rwzd+O0nc7pGRcWiFKracRM79vtenlPF5R5YAOUA09nwKWJfO95NNroE7x7 nAOVU/1iVEpQwJYN0N4YA2o7Al8jhRMqfAP8L/yAx4ISApPkDb4dza/wz7HFvT2KJmu1 Vunv8FGRC2F07wfv01CvcuW4VSznlf9JTHisJNXO87jGQUo+uyOd2VvFG9HB6EL9Dgne lr3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781179170; x=1781783970; 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=1LGwl9Ca/ahgzdKu9eaaXl5zm9WU2DHHXPH7cdDgJKE=; b=IBiikJGvHaI8PwCtSRakXHuhkbHZfk6vAFW7YgAu3dRwLNxc/4DFX8Yx+dacTfTzXJ snkiWGi5J6IvWqu5Ulef/RkR8MQaTixZFpLfbaaFfXyX7CibE1dll2Klk5IkHr0Viz5d 9JpEyHac46NuYK8sSrlR/nFTCc6YlQqQYoPQhVQjT8oLkMaLr+nJXEX0J33PrXxUdgC7 RhVLow9I/GEU/Tefl1RQb9Yhbz37GW2+z26/mjRBBxqR1HbmWLGxLcRF8Z1t3P51U++m w5YnHWiOQeTzizP/Ft0qCC99BDFXx32pVSfvRkeUYTW0runYMEM48W+vfUDtDQ8RSvwi WiPA== X-Forwarded-Encrypted: i=1; AFNElJ/jRex/LT+wTRvDGlk42svjsUXLdFN16JqOUG34gF/LJEr2R1nKmyQI3PlMjlUpn/QUKfae9kXzdUQpj98=@vger.kernel.org X-Gm-Message-State: AOJu0Yzu6LpZ4AWqPNeN3hKGWEsIhmtUTU77V/a0YTZbViqGvf5weMKU g6nHyPfhWFcoCZTbOErF8KXEoITerGKmuF98cakiTJ8Ljn3KrP2zqEiU X-Gm-Gg: Acq92OGftJgh3hp/2PbqZV5gTrLw+d0cUCyq9uNZ0xkQ28pFCam/D8Vd06+mimaWqyy fl0DFNqMR9+nAY8VsR9CRDNO8APkjxTwy6kgvEWZb5QnOM2HqniZOUK8c5dXK6q5WjSA4pE8E+A hWkHDVs/3zIMtywLA6X86W4oWz3+qJzPX4EOhEfCCZn2CfmPr8LIf/M9c3TE7TLkQKvgfyjQLve o+c8R5RfzOqfHk6rgisffoBUzFpeZZR20j3JVOzF4fFZ35dcN0uIKa8axfIYXxLyCdL4RQ8b9lA zFf7oHRdpgfk5JmRfrN0VP+5PXZPRktYl5EA21Al9oDd5R/WFrqIM1x05/oS1P5zL3At4YRmEW6 iw9jmUyq/ll3TvSsC8ZAQ0QNz9VhLaacvof+V3Ngp4TVj+t3gJCNBFsCuhCWHwl6nlBcbtqlW6f 6+LQm3yMf54l7HCYpS2FOcNOuyOAkDb47MPREJE7PqUU3ULDk2DOgNL4NKLXWTmfNMfDtl X-Received: by 2002:a17:90b:3f48:b0:367:cb53:7435 with SMTP id 98e67ed59e1d1-377abda15cdmr2867265a91.24.1781179169639; Thu, 11 Jun 2026 04:59:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37753d02ca4sm2499692a91.12.2026.06.11.04.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 04:59:29 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Liam Girdwood , Cezary Rojewski Cc: Jaroslav Kysela , Takashi Iwai , Peter Ujfalusi , Bard Liao , Kai Vehmanen , Pierre-Louis Bossart , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 03/20] ASoC: Intel: avs: utils: Use guard() for mutex locks Date: Thu, 11 Jun 2026 18:58:44 +0700 Message-ID: <20260611115901.80438-4-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260611115901.80438-1-phucduc.bui@gmail.com> References: <20260611115901.80438-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/intel/avs/utils.c | 39 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/sound/soc/intel/avs/utils.c b/sound/soc/intel/avs/utils.c index ee36725ac731..ca1236731824 100644 --- a/sound/soc/intel/avs/utils.c +++ b/sound/soc/intel/avs/utils.c @@ -48,13 +48,12 @@ int avs_get_module_entry(struct avs_dev *adev, const guid_t *uuid, struct avs_mo { int idx; - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); idx = avs_module_entry_index(adev, uuid); if (idx >= 0) memcpy(entry, &adev->mods_info->entries[idx], sizeof(*entry)); - mutex_unlock(&adev->modres_mutex); return (idx < 0) ? idx : 0; } @@ -62,13 +61,12 @@ int avs_get_module_id_entry(struct avs_dev *adev, u32 module_id, struct avs_modu { int idx; - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); idx = avs_module_id_entry_index(adev, module_id); if (idx >= 0) memcpy(entry, &adev->mods_info->entries[idx], sizeof(*entry)); - mutex_unlock(&adev->modres_mutex); return (idx < 0) ? idx : 0; } @@ -86,13 +84,12 @@ bool avs_is_module_ida_empty(struct avs_dev *adev, u32 module_id) bool ret = false; int idx; - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); idx = avs_module_id_entry_index(adev, module_id); if (idx >= 0) ret = ida_is_empty(adev->mod_idas[idx]); - mutex_unlock(&adev->modres_mutex); return ret; } @@ -163,50 +160,44 @@ int avs_module_info_init(struct avs_dev *adev, bool purge) if (ret) return AVS_IPC_RET(ret); - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); ret = avs_module_ida_alloc(adev, info, purge); if (ret < 0) { dev_err(adev->dev, "initialize module idas failed: %d\n", ret); - goto exit; + return ret; } /* Refresh current information with newly received table. */ kfree(adev->mods_info); adev->mods_info = info; -exit: - mutex_unlock(&adev->modres_mutex); return ret; } void avs_module_info_free(struct avs_dev *adev) { - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); avs_module_ida_destroy(adev); kfree(adev->mods_info); adev->mods_info = NULL; - - mutex_unlock(&adev->modres_mutex); } int avs_module_id_alloc(struct avs_dev *adev, u16 module_id) { int ret, idx, max_id; - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); idx = avs_module_id_entry_index(adev, module_id); if (idx == -ENOENT) { dev_err(adev->dev, "invalid module id: %d", module_id); - ret = -EINVAL; - goto exit; + return -EINVAL; } max_id = adev->mods_info->entries[idx].instance_max_count - 1; ret = ida_alloc_max(adev->mod_idas[idx], max_id, GFP_KERNEL); -exit: - mutex_unlock(&adev->modres_mutex); + return ret; } @@ -214,17 +205,13 @@ void avs_module_id_free(struct avs_dev *adev, u16 module_id, u8 instance_id) { int idx; - mutex_lock(&adev->modres_mutex); + guard(mutex)(&adev->modres_mutex); idx = avs_module_id_entry_index(adev, module_id); - if (idx == -ENOENT) { + if (idx == -ENOENT) dev_err(adev->dev, "invalid module id: %d", module_id); - goto exit; - } - - ida_free(adev->mod_idas[idx], instance_id); -exit: - mutex_unlock(&adev->modres_mutex); + else + ida_free(adev->mod_idas[idx], instance_id); } /* -- 2.43.0