From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 17F0318A6D4 for ; Wed, 29 Apr 2026 07:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777449162; cv=none; b=ABxW4ZttF+0L9bLqVxDfiFJaWrSbj2EVpgy81g3+FHNRSUQ0TqyYK+Cu+zDHd7Jk1coAwNyJuxzuF8p66jwYhZPGTihmGxrWv0D2IF9emE3/lvK/pr0uWyEv9IYNyO4EboAzTXrfW46xBe4d3mUlNOkUjrJ5l1OWVgf3rkGxDtQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777449162; c=relaxed/simple; bh=oCLGQTuEbMDQqoVmqKx4iWwM0fflms+MlVxpUpjSMcI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LwgKYReELcV4jnsT1Bq2AF/kP7UndCPhjdDIbxcuhECWFz3n2ae9F97ZnpC36EDLq1bAf3nRJISFocmhTwK5XRXbxlz/TN8STj0z943avUt8D7cjt3zelgOkzsTiun1jrtFrxZ/oDKO5s0UnqLeyeuOugmqoV0FHDg8es+5ES3U= 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=LAdPtzj2; arc=none smtp.client-ip=209.85.210.179 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="LAdPtzj2" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-82f8893bff3so5760173b3a.2 for ; Wed, 29 Apr 2026 00:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777449160; x=1778053960; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kwCsJYvKlZdZ5vZPdLNuJ1ag/PmU+0BuF1eqiF5TioQ=; b=LAdPtzj2MF04p/jStp9MFVrAmcUjUr0lT3PHXCnwpdnzIimzUVD/TbZ1eXNGEq3y6/ c2JN2uGb/nhwCa9nP6vWMh+QoCQ8Fmy5tcM+PYGBnpnKl9kObEoxc3J54Y7B34Hc7oa0 gmTcWgVZsCJrahpeyMOz1BvpTEakFEvSF/7DJC/TglCtgU5kipWGy2zjUFddfzBurcXK FeuOuQF0A79pElThTtj5iMMuiW116kqPt+SQpa9vTzEvcBinjG6IfEvzUGzyQ5JRcfM6 YpXyiupId+jNgrFGMzmhZeqsATiuEZjeojVvZZAd88FAdubBQehCixAF/Mg/Nqm79VAo uhfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777449160; x=1778053960; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kwCsJYvKlZdZ5vZPdLNuJ1ag/PmU+0BuF1eqiF5TioQ=; b=HDCbhdhTBkfxL5SmomfkzANROJJnz1Yw8Isd0UGxpGpR/dqyB32Yk8c78aZVRfT+X/ 8VV9wT/Kgnj3TgpDbXEzHoBUV4q1MYBYudHlDL4X/tF7YHhZBASD2f/exWN2e9fIMGpy XEBH630AHGfOvC+WOMJqJVNmgn8bAfbGgF1XiqjMQsehnzQgOC3OjQY0VeLJD8IYOa0p Jw2NYA4jGoEasl9EvoqApTLJPHKgW8k3JAX9fICAwo0c6OqeOS37BTheRTarqE+37lzB HqG+ED1vUMvHN6m3SnRl4kg/sNOUQPRV5bKgjexAwZD9ltOajZJ1aq/plBuCXM2CiJiy DoXw== X-Forwarded-Encrypted: i=1; AFNElJ/B0TkHLlQFXQKwSdNyA/r3qRyFiEQUbVzj6QwSihrQlWMNXuVkGW/gxyCn97mxTTqfyUm/1MPcKSaZ3X0=@vger.kernel.org X-Gm-Message-State: AOJu0YzJNGQlZbjebH9g2gZyBLybg/Ei6O6+6//8n9xziNHp8EMnX6Tf P1HWo1u9PK756sQo4NEPT0T0pdVGk74IFq36v2a0ytdY0GU+mIVTsk89 X-Gm-Gg: AeBDievkR/8CCI9VH9x3WJFyCp731f/SCsVIScXgtSJIAq41+qvfQ2x2U/XvZT8kiGs RZzOSNtyF+bOuj2J3IDgBy1iHAA1X3oOsJB9kZAfWFuaI4SXS71wlPKVuLoDKZp7Gt6H7wmHdix nqHdJ0S1I4lsayI8C6Dezsf5ERzpj3QVFPFfUB04Uk4KmaQhSDba+ix+vX93lpRtX3o4U1trf+T 0CwyF06BH7FL6IvYTQXbNDwxxSZHZw3L9XHNqqvWhdAJ3L624Mm+jbbCPhnqAGG9yRFq5oO1V+v 6ZbeXx8I3dQ47muFjpT5CaTkbQ6VOfReBTf0MLBLn0t0ak9PYpWHwGRj30CTs4FnobGc0ft7z1i 1fEQaMQyoz6r8qPpG6jgxdTAIXlAPflq4+4fSpytZMBaewdkZQmnxZM4ws43COXXLJKjOxQ5Ff6 ZZ7VTNaTRFb3ZbTcsig6Jee0oeBSfJAOZLV3g9qIDo2A6FltCFnDj1HPRFekvM1SJh2o7B X-Received: by 2002:a05:6a00:440b:b0:82c:215d:5e9d with SMTP id d2e1a72fcca58-834ddc14dadmr6684766b3a.32.1777449160405; Wed, 29 Apr 2026 00:52:40 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-834ed7eb783sm1213720b3a.42.2026.04.29.00.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 00:52:39 -0700 (PDT) From: phucduc.bui@gmail.com To: Liam Girdwood , Mark Brown Cc: Jaroslav Kysela , Takashi Iwai , Charles Keepax , Kuninori Morimoto , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH] ASoC: ux500: Use guard() for mutex locks Date: Wed, 29 Apr 2026 14:52:21 +0700 Message-ID: <20260429075221.73989-1-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 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/ux500/mop500_ab8500.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 2e6ed19a18cd..2a459267f0f9 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -234,19 +234,18 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, substream->number); /* Ensure configuration consistency between DAIs */ - mutex_lock(&mop500_ab8500_params_lock); - if (mop500_ab8500_usage) { - if (mop500_ab8500_rate != params_rate(params) || - mop500_ab8500_channels != params_channels(params)) { - mutex_unlock(&mop500_ab8500_params_lock); - return -EBUSY; + scoped_guard(mutex, &mop500_ab8500_params_lock) { + if (mop500_ab8500_usage) { + if (mop500_ab8500_rate != params_rate(params) || + mop500_ab8500_channels != params_channels(params)) { + return -EBUSY; + } + } else { + mop500_ab8500_rate = params_rate(params); + mop500_ab8500_channels = params_channels(params); } - } else { - mop500_ab8500_rate = params_rate(params); - mop500_ab8500_channels = params_channels(params); + __set_bit(cpu_dai->id, &mop500_ab8500_usage); } - __set_bit(cpu_dai->id, &mop500_ab8500_usage); - mutex_unlock(&mop500_ab8500_params_lock); channels = params_channels(params); @@ -339,9 +338,8 @@ static int mop500_ab8500_hw_free(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); - mutex_lock(&mop500_ab8500_params_lock); + guard(mutex)(&mop500_ab8500_params_lock); __clear_bit(cpu_dai->id, &mop500_ab8500_usage); - mutex_unlock(&mop500_ab8500_params_lock); return 0; } -- 2.43.0