From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 479F43E3C48 for ; Fri, 26 Jun 2026 08:29:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782462590; cv=none; b=eITOYJRcM8+db/eengfRj4D0OgDs5iL5VMoLOLmUTVEEVqHf2SQ4cwF/1Te6Vaips78GZ/XwPQYKGM/wyN5Z+ZMWqHuzo3gz7Fb7rf3e/P3MM3Zk3PzH212KNkqcHMTWlx3CXAXJVrjjyVkaSsmymmHLwJEe/CAills3xhRB+qY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782462590; c=relaxed/simple; bh=suzK3gGMP9V0L9I4x2dEm+tcY9D7ZqEks0pLmeKX8x8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E+yV9gvrHR7zDXYAMlfwqLcOrFienM4xBhiYJkSAiFC7mTpRvCziE5xzhOTqIpELpVtnph9GRMDuUgo5578RyNAi3FTjUUePJeNzC+ZWUzPTKvXI8EsEU3t88yus4TRZgQ8iyj0kO4pJfxBQYs6T28bXCVpa/mQZ2XyOPhSchtw= 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=qn6XSVIQ; arc=none smtp.client-ip=209.85.210.169 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="qn6XSVIQ" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-845c65e0a10so276983b3a.0 for ; Fri, 26 Jun 2026 01:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782462588; x=1783067388; 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=vNl7MaQInFa9VForV88gG+7boy7vN5O3P/61t1cZ6iU=; b=qn6XSVIQCZAPCL+dvaBfCRuuymPbXbWNpDAjYLxWHLXHlFNzJBqjfV4zpG+Vwf093l zjC0hB+UOp6rvA8k7nLV+yvYszlKDFRlmpjT5HpIxFJ9jYPh0PgHei/0ZrsUzthZGZty 7rv+/raL9rsKPJAgEFGyQgTInmg8MuONAjHNES53t5te754fc5O4ka/A5LfBvwyE0ro1 hoQdKauJc3+EsRQuvHkamvW9izZ4nji62eyrVYaKFFvwowJQviKCRIVHYLRd58+1Tx05 RIxeLgAt7IzMneeAYXT/qn5O2Qh/9jVbXXzbrcNVNEbg00r+QmSmTRq2eqrP/32Ces2j 9stA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782462588; x=1783067388; 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=vNl7MaQInFa9VForV88gG+7boy7vN5O3P/61t1cZ6iU=; b=Y0UaXpMsgM+aLqlntslCaEgBnUKj7wswwaXslFtaDgDkABrkzL4ihB4C1BEQjDVofj 2VXJNLLofwEE0DgChMNSHpVG3JF2j7XdqOizX7WEarNurF2duzYC1GWCgFLVplLlA7cO Mxyfq05Q6TCBiDXywwUcFOiYgDSGhVbDZGeAj2rXB2NitGOhEQvNbO08ZrRD4Tm4CNBW KVmljTqCYB+wpuUvKRPF82KLPuI3Uzra07TkGidoGtJyywhImJwF9mv20WAFtIoqw2bq SKg3Ch0NOzBQ2U3EG4umxGqR4beXRCQljLf26MYm/UKbHk0Kv7W2jMLR8XgN2qiI9IRe GTJA== X-Forwarded-Encrypted: i=1; AHgh+RogJMJNnDx260Zw2mdmbM5Vi4CzqN14kBCxXJIuFOaj8kiXdGJVF1tK7PfU/DR56NfilDSN96O9/VO1bF4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9bRm6+zGm4lxhPG8dMkJTMc/BhUsEWIItRf6dcDhJLMw7R3rv AZXwXqoO9thcOpzNNr/LJLUDAqz08w6+OvCUTZKE2YI7Id2Ax1ynqq/E X-Gm-Gg: AfdE7cnQy7l5MQPtyojpnKA/uB2p+ybKX5nWNC2qP4XkcSUGxXh9a/ysgWQDrhRv57+ 0FjSSfGqRgpRQT5i6DNX5YZeshkHBYQ5AuLZExRNT5k2HQ9E8+RDXN4gqbdgHjGIyTbMM0v/NFF nuVdbY28jaJOqJWU1ANN7ZHQ9LRCOFHue7sopAC53xJqQR2SfXkEuoEABkkMWut+hAOTLw08JMK tb8t4kfoRIsaIg0zjcBKKpHxVXQVXqym9xwZhkPUgjv368IB3qhgwZIpABCIlDGzASSg9iSKHJy HpjXGjEg71x8K/YcQrDNAVd+IuuqQQ3C50Vd9UbN4UtfmRh0HXUoKplxvtUz974vfHfgQquY88O +Z8T8qLAqG0M2Aagn1njp60tntDd5+7eQo2ximLU1e2VxrhMY2PECBcsyKYbDrw/2T1S7RJqvFc GJ5Lr9AYfkpf0nxLxl2SYtvmwcka3UpQdJj+zk2pEdvEXnfKY= X-Received: by 2002:a05:6a00:94f1:b0:842:4327:6cfb with SMTP id d2e1a72fcca58-845b3b0411cmr6499167b3a.46.1782462588250; Fri, 26 Jun 2026 01:29:48 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-845a40d234esm6708789b3a.29.2026.06.26.01.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 01:29:48 -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 v4 5/5] ASoC: Intel: atom: Use scoped_guard() for scoped locking Date: Fri, 26 Jun 2026 15:29:04 +0700 Message-ID: <20260626082904.32344-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260626082904.32344-1-phucduc.bui@gmail.com> References: <20260626082904.32344-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 scoped_guard() for mutex locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- sound/soc/intel/atom/sst-atom-controls.c | 38 ++++++++++---------- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 20 ++++------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c index 701369349fb6..82df398237da 100644 --- a/sound/soc/intel/atom/sst-atom-controls.c +++ b/sound/soc/intel/atom/sst-atom-controls.c @@ -750,27 +750,29 @@ int sst_handle_vb_timer(struct snd_soc_dai *dai, bool enable) return ret; } - mutex_lock(&drv->lock); - if (enable) - timer_usage++; - else - timer_usage--; - - /* - * Send the command only if this call is the first enable or last - * disable - */ - if ((enable && (timer_usage == 1)) || - (!enable && (timer_usage == 0))) { - ret = sst_fill_and_send_cmd_unlocked(drv, SST_IPC_IA_CMD, - SST_FLAG_BLOCKED, SST_TASK_SBA, 0, &cmd, - sizeof(cmd.header) + cmd.header.length); - if (ret && enable) { + scoped_guard(mutex, &drv->lock) { + if (enable) + timer_usage++; + else timer_usage--; - enable = false; + + /* + * Send the command only if this call is the first enable or last + * disable + */ + if ((enable && timer_usage == 1) || + (!enable && timer_usage == 0)) { + ret = sst_fill_and_send_cmd_unlocked(drv, SST_IPC_IA_CMD, + SST_FLAG_BLOCKED, + SST_TASK_SBA, 0, &cmd, + sizeof(cmd.header) + + cmd.header.length); + if (ret && enable) { + timer_usage--; + enable = false; + } } } - mutex_unlock(&drv->lock); if (!enable) sst->ops->power(sst->dev, false); diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index c757e4dcd7cf..9ee4d9926e06 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -304,15 +304,14 @@ static int sst_media_open(struct snd_pcm_substream *substream, spin_lock_init(&stream->status_lock); /* get the sst ops */ - mutex_lock(&sst_lock); - if (!sst || - !try_module_get(sst->dev->driver->owner)) { - dev_err(dai->dev, "no device available to run\n"); - ret_val = -ENODEV; - goto out_ops; + scoped_guard(mutex, &sst_lock) { + if (!sst || + !try_module_get(sst->dev->driver->owner)) { + dev_err(dai->dev, "no device available to run\n"); + return -ENODEV; + } + stream->ops = sst->ops; } - stream->ops = sst->ops; - mutex_unlock(&sst_lock); stream->stream_info.str_id = 0; @@ -347,11 +346,6 @@ static int sst_media_open(struct snd_pcm_substream *substream, stream = NULL; - return ret_val; - -out_ops: - mutex_unlock(&sst_lock); - return ret_val; } -- 2.43.0