From nobody Mon Jun 8 18:55:16 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 F3F612236F2 for ; Wed, 27 May 2026 10:02:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876148; cv=none; b=ARK7bm4NBR9jib2E8oZDzsM7xNUO81H5BoceZABJOg4NDUee+DS0v3m8h3+RIkI6iRTxBYvohNeCa0SI2DMnYg6Wk3o4tMCGJ0zhRHsZUe+Xh0jvCn9yZgh8Gpal2STjMhPOKatJBdWC/oSeaaBDiH48L92WmK117Rn7BXzf5BI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876148; c=relaxed/simple; bh=Bjf7hN3TI8rBFo86J3VB/I2bXgASxc3O0HsCfJhlguc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e3VczUulldJ2DAM5WfhRXop88rm8jBvOvWY38s4BM2ntbRh2CJnUw2woudZJm8pEZMKO0Z40Cg3PZf5wKwW6wpvU9e25Mj05BcOOUnpnMbQmou8Dz+5rNjBrg241b05GYV0IVlJpvcIM1dxx0yYF8LJdS7xWTQfOnO9JqW/6VGg= 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=M3PRau80; arc=none smtp.client-ip=209.85.216.51 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="M3PRau80" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-36af4b7840aso2036439a91.3 for ; Wed, 27 May 2026 03:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779876146; x=1780480946; 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=llv9eK39iuv/ZdjHyRDnfcx6/aCeoNvT9KJ0UUI6ILE=; b=M3PRau80geVT2mfplxY45WSmjg6LeCfLv7puXYaEKwupkrD4ArgqcFuVOBDje1EXzm IbbbWNqTFBgb3D6rLW7E3DCek4wg38rgbWkFJdsEj/XRC1EBr3c9a1eq1Kr/AjWLekTb 98jetiKFPId71et80qMOlZaKV27/fxJHTvsAHqYJOD4GMDyVreEdm+IstHiJSbmWcTA5 7tFYVasYIp5SUdcCk9p80PqkRBrkqQ7XvhD8CrJZyS/crhqLCEfIVzOfHWqtq0yWVE1F dqx+8zuKlPwEtAW7PRJJOdebnxJTQco7LCRk9fewYR1X1LPwzkvqR+q0AracOgzcqZYJ 4QjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779876146; x=1780480946; 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=llv9eK39iuv/ZdjHyRDnfcx6/aCeoNvT9KJ0UUI6ILE=; b=L+wHoH2Jv3B8JfsqdV5U7vbjuq3nXFVpH20LX5YVBZJwaZTnGFryFSfEnMpGCJs5KP XWsTs4KKhKxMnA7wvhSh8Ei7Gew8k4muFnGYPh9ElLc4e9RV+BdjSfwrP4Qx/NIELXNZ eevwuZwcLwj7qnQu8UfwjoCbM1XdItOUCmiXpv+i22dS7BfNwQIC88OPPE2r5W14KIHW /POOAdabUzFM1Usb6QF9VmQiuMHt95ZZCSTfMcnH3J7ZmzlbwInzovIEYEJIBbtbhQR9 jj2ZgaUVg//JHNEz/nZZ5S2dZs9NqBZnm0InxCoORb9DRGyNUjrJS0ZyrRojwhSxcBFc R78g== X-Forwarded-Encrypted: i=1; AFNElJ8pVyxo5zHLm/mZILc42bOuQZrRquzfyTmkprnhb5izCseNCA/uZfWPgx3OPzVOthgixcsmkqsrhT7yYOg=@vger.kernel.org X-Gm-Message-State: AOJu0YxHBuNBs9tYGzwPh+zfXqVQW9Xsdq97+wPIbdnJnJfFiAZJHwO3 EXKZfHXawl4JLx38Ts/lWthCq5DyD84+aBgOHdUlSKQ1sdQT9ASGas9NQd6Lqg== X-Gm-Gg: Acq92OHNKTWXjBqs9UiOksfl5uN44rq44vBDxdp8lks+oWtvuvxk93k5i82VBognxD1 fQ0N+fgSqMcJoAlwgCQ9aroez3hVmNmZySX/CHp0tVK6zEe04p5SLCJIAuSjgJIzuSEPo3p60J2 BCDAY8uH3pgmk2xZxKc7j9xC+8FhKBFhEdiuBU3Oyld9XjT/D8W5xH8wC0nasv9rWIbEmpPP35B TblAO+dF6BYeJMTbO42UdNpJxd7Pv0VGT6LjRcWWoeE4S2sVEeeiKCe7MbREW7tACFnZrxGwT2r cUffS6WtvdUL+dV1u3aDJPYLjEINqBFPLccYXc/NhGqU6zYeg7oEZJHFSstxjtEUSp0dOXFimg9 ytfm6BB1PsUFfZjMAe276B/tVL4gK9gomkTYqkTZ5RqdyibS8JCfBY3bsiOI9gprqsY+rwSb73u 6ySI/whit2580S9dHFEFtpwco9anAgZgjO1YR3soxCN8Q1Y5l1/EqwUe7XCw== X-Received: by 2002:a17:90b:1d47:b0:35f:bb33:d728 with SMTP id 98e67ed59e1d1-36a67452011mr22584002a91.11.1779876146159; Wed, 27 May 2026 03:02:26 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85202902b1sm12205631a12.6.2026.05.27.03.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 03:02:25 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Arnaud Pouliquen Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 1/2] ASoC: sti: uniperif_reader: Use guard() for spin locks Date: Wed, 27 May 2026 17:02:05 +0700 Message-ID: <20260527100206.26788-2-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260527100206.26788-1-phucduc.bui@gmail.com> References: <20260527100206.26788-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- Compile-tested only. sound/soc/sti/uniperif_reader.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reade= r.c index 05ea2b794eb9..45d7613f595c 100644 --- a/sound/soc/sti/uniperif_reader.c +++ b/sound/soc/sti/uniperif_reader.c @@ -46,15 +46,16 @@ static irqreturn_t uni_reader_irq_handler(int irq, void= *dev_id) struct uniperif *reader =3D dev_id; unsigned int status; =20 - spin_lock(&reader->irq_lock); + guard(spinlock)(&reader->irq_lock); if (!reader->substream) - goto irq_spin_unlock; + return ret; =20 snd_pcm_stream_lock(reader->substream); if (reader->state =3D=3D UNIPERIF_STATE_STOPPED) { /* Unexpected IRQ: do nothing */ dev_warn(reader->dev, "unexpected IRQ\n"); - goto stream_unlock; + snd_pcm_stream_unlock(reader->substream); + return ret; } =20 /* Get interrupt status & clear them immediately */ @@ -70,10 +71,7 @@ static irqreturn_t uni_reader_irq_handler(int irq, void = *dev_id) ret =3D IRQ_HANDLED; } =20 -stream_unlock: snd_pcm_stream_unlock(reader->substream); -irq_spin_unlock: - spin_unlock(&reader->irq_lock); =20 return ret; } @@ -355,12 +353,10 @@ static int uni_reader_startup(struct snd_pcm_substrea= m *substream, { struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *reader =3D priv->dai_data.uni; - unsigned long flags; int ret; =20 - spin_lock_irqsave(&reader->irq_lock, flags); - reader->substream =3D substream; - spin_unlock_irqrestore(&reader->irq_lock, flags); + scoped_guard(spinlock_irqsave, &reader->irq_lock) + reader->substream =3D substream; =20 if (!UNIPERIF_TYPE_IS_TDM(reader)) return 0; @@ -386,15 +382,13 @@ static void uni_reader_shutdown(struct snd_pcm_substr= eam *substream, { struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *reader =3D priv->dai_data.uni; - unsigned long flags; =20 - spin_lock_irqsave(&reader->irq_lock, flags); + guard(spinlock_irqsave)(&reader->irq_lock); if (reader->state !=3D UNIPERIF_STATE_STOPPED) { /* Stop the reader */ uni_reader_stop(reader); } reader->substream =3D NULL; - spin_unlock_irqrestore(&reader->irq_lock, flags); } =20 static const struct snd_soc_dai_ops uni_reader_dai_ops =3D { --=20 2.43.0 From nobody Mon Jun 8 18:55:16 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 44CB63EDAD3 for ; Wed, 27 May 2026 10:02:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876152; cv=none; b=J0SEvSltkTiHiYX8ZpnQcDBg/Lpz2r3e5qC90iQZvkIPmotKw2lDjUmam2BUpLN29oL2PuJPLX49jPKDCBDAqpb59TbRAqNNVzGgFez5o/fCz4J/e7rVpGb97/pyVafayCscGpU/5K2oup/g0aUg4X1HA7PW+RC7hXxmDoAAWOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779876152; c=relaxed/simple; bh=NLNQqeXkei9wv3klacbTTFdaeG/NZV4GJ88Um9WERzA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BYyrIwhffoAdpORU57RpmQIOOSAlWMhmWHq+nDYu7CFVLwZaUYRHxWw1H2C966iijSdGeECZ5823xXW5ws8k166Q7liw2pO/9lLiaNg9OE4Q7oAik4yVKntGkakPfZJqZbFIgvU2E92QvuaM8UZAlz2Ip7+VxOYHj3HyZlviF6g= 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=n+zK11zy; arc=none smtp.client-ip=209.85.216.41 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="n+zK11zy" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-36931e4f5e8so10734374a91.2 for ; Wed, 27 May 2026 03:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779876151; x=1780480951; 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=ruiN7Don1fsxHLQ1dcIBOeuAr/tHo9uT0rXYDH6zHfM=; b=n+zK11zy0TSG9FtQRWTQK3J7kEj4IfY9fihMBD0h/SL1tpH3WjEiP2vlYuxP4htfJW 3r0NQQqADSQzjoYjBjHzCajNyg2oEDsO7ioV3YgLcZMSM8iQq+pVAFdNyuFJlo5GzDJI CU5MWO59ZgsFChawL5C65/wTv2KCDPvN849UIOoZXl/xOQUrnaYYhVEVbAcGqYbxLbQ2 IBALjXhJaiulrqiBIxq/8ghuuhuzxpkW61IoDolYDEWtv3t0KPUoldUS/I9yvDzAWW2y YNXi7MlHV3h16/Og8Yi5icgi/HRiyN5zBXdvSNQncz16F3aIMbNF2g9zY1o8Wj8CX8pb A9bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779876151; x=1780480951; 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=ruiN7Don1fsxHLQ1dcIBOeuAr/tHo9uT0rXYDH6zHfM=; b=HZoA7RH/vs4z23R3FE154X+AM3cbpypsToxFLJ7tBnyaMT80XRI2+7WalO69R3MCKS W61YgKj4cVe7T6IVdMen01/ls0nUVCzOdh4l1KNkVRZi4Cxk3aNGHCJKdU/6VlkoeLVs VucrMFiW4Xa2+Jtyahf2c6uGQ6YD0wlIlC+3tpwvrmfDqCEZ2n6tX87Ae7QksJw+LXbt JEFm3pA+xy81UTvkl1rS5bPUjB0TK2EzNNDP/Py3wvym/EyGQDQdqgcf/Rj0vOm1bpxP TiDlhEjWL/0FHCiF41Zu5DTj2+eLcEWMLNyCEvesfuZ9p2R93vg8tpgrfH4woHQyY2WK tc/w== X-Forwarded-Encrypted: i=1; AFNElJ+Cyvlw5T3rpFoC83ZLdmTGJ3ShFoCrxoAsVZU9NxYuRlQpLXmByuiANDLz1dja7zPK4VurJq7t6emwTdw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw40bCJNCDa/mXDaDyEe+AsFPhggNt4Gk8NG6O8mwVpF/vsmCqx vF3PAm/SpwJrFhnfxSAu3rCzCSGjOfB6X/32wQQ/ztVOD+1fJ5czwbNp X-Gm-Gg: Acq92OGg32tKNxJt9NkWcm4KOQ+wpRE7kM4QUsIUHItCOhnTugwfvXF8DJA35WsxzZX TOIkuXYpXLJ4earZAX8gBqkDlXjTpQKb2AHrJNY3GjwvFIb+CBmj3/fFGpNFsZgdo2kiJj8m01Y r+3G/NyzFV0/Gm8nfXGZBlJPyitero4qflosljqAGzvJjtUHq6uZfI4nQf6TkY9Ut5SuZOogpLt 1qIH0mKQGTnErwdSwbIm8c4V3p0LBbSpoPAdDPHrbYFKg/6QLXt/oLCCyJKFej5isezY9ikvVOW q9bzNO2687NjWQnkMxflkvKU6/cso7J6OY56JL1RzOMQWyTNF5wrMmfOSb3I6r5O5GW2t6nvNxI /GhyVF2mNMS+sl58t9ynsFWZ1ryou8uBZatEJSMrBkz5CCNjJckaeI3ahWgO+CefA9SNxQqPX9b aM2+VDPi9i5VpyHoY9MswyJxuyCIIETfOGVNLhnoIk2g0HVHbj/wMEyGUhSMxorwSO5opQ X-Received: by 2002:a17:90a:c88d:b0:366:10f1:3d86 with SMTP id 98e67ed59e1d1-36a67616988mr23282564a91.22.1779876150588; Wed, 27 May 2026 03:02:30 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85202902b1sm12205631a12.6.2026.05.27.03.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 03:02:30 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , Arnaud Pouliquen Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 2/2] ASoC: sti: uniperif_player: Use guard() for mutex & spin locks Date: Wed, 27 May 2026 17:02:06 +0700 Message-ID: <20260527100206.26788-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260527100206.26788-1-phucduc.bui@gmail.com> References: <20260527100206.26788-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: quoted-printable Content-Type: text/plain; charset="utf-8" From: bui duc phuc Clean up the code using guard() for mutex & spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- Compile-tested only. sound/soc/sti/uniperif_player.c | 73 ++++++++++++++------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_playe= r.c index 45d35b887e4e..e4b9799ad9b2 100644 --- a/sound/soc/sti/uniperif_player.c +++ b/sound/soc/sti/uniperif_player.c @@ -65,13 +65,15 @@ static irqreturn_t uni_player_irq_handler(int irq, void= *dev_id) unsigned int status; unsigned int tmp; =20 - spin_lock(&player->irq_lock); + guard(spinlock)(&player->irq_lock); if (!player->substream) - goto irq_spin_unlock; + return ret; =20 snd_pcm_stream_lock(player->substream); - if (player->state =3D=3D UNIPERIF_STATE_STOPPED) - goto stream_unlock; + if (player->state =3D=3D UNIPERIF_STATE_STOPPED) { + snd_pcm_stream_unlock(player->substream); + return ret; + } =20 /* Get interrupt status & clear them immediately */ status =3D GET_UNIPERIF_ITS(player); @@ -116,7 +118,8 @@ static irqreturn_t uni_player_irq_handler(int irq, void= *dev_id) dev_err(player->dev, "unexpected Underflow recovering\n"); ret =3D -EPERM; - goto stream_unlock; + snd_pcm_stream_unlock(player->substream); + return ret; } /* Read the underflow recovery duration */ tmp =3D GET_UNIPERIF_STATUS_1_UNDERFLOW_DURATION(player); @@ -143,10 +146,7 @@ static irqreturn_t uni_player_irq_handler(int irq, voi= d *dev_id) ret =3D IRQ_HANDLED; } =20 -stream_unlock: snd_pcm_stream_unlock(player->substream); -irq_spin_unlock: - spin_unlock(&player->irq_lock); =20 return ret; } @@ -363,10 +363,10 @@ static int uni_player_prepare_iec958(struct uniperif = *player, =20 SET_UNIPERIF_CTRL_ZERO_STUFF_HW(player); =20 - mutex_lock(&player->ctrl_lock); /* Update the channel status */ - uni_player_set_channel_status(player, runtime); - mutex_unlock(&player->ctrl_lock); + scoped_guard(mutex, &player->ctrl_lock) + uni_player_set_channel_status(player, runtime); + =20 /* Clear the user validity user bits */ SET_UNIPERIF_USER_VALIDITY_VALIDITY_LR(player, 0); @@ -546,11 +546,11 @@ static int uni_player_prepare_tdm(struct uniperif *pl= ayer, =20 /* set unip clk rate (not done vai set_sysclk ops) */ freq =3D runtime->rate * tdm_frame_size * 8; - mutex_lock(&player->ctrl_lock); - ret =3D uni_player_clk_set_rate(player, freq); - if (!ret) - player->mclk =3D freq; - mutex_unlock(&player->ctrl_lock); + scoped_guard(mutex, &player->ctrl_lock) { + ret =3D uni_player_clk_set_rate(player, freq); + if (!ret) + player->mclk =3D freq; + } =20 return 0; } @@ -575,12 +575,11 @@ static int uni_player_ctl_iec958_get(struct snd_kcont= rol *kcontrol, struct uniperif *player =3D priv->dai_data.uni; struct snd_aes_iec958 *iec958 =3D &player->stream_settings.iec958; =20 - mutex_lock(&player->ctrl_lock); + guard(mutex)(&player->ctrl_lock); ucontrol->value.iec958.status[0] =3D iec958->status[0]; ucontrol->value.iec958.status[1] =3D iec958->status[1]; ucontrol->value.iec958.status[2] =3D iec958->status[2]; ucontrol->value.iec958.status[3] =3D iec958->status[3]; - mutex_unlock(&player->ctrl_lock); return 0; } =20 @@ -591,23 +590,20 @@ static int uni_player_ctl_iec958_put(struct snd_kcont= rol *kcontrol, struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *player =3D priv->dai_data.uni; struct snd_aes_iec958 *iec958 =3D &player->stream_settings.iec958; - unsigned long flags; =20 - mutex_lock(&player->ctrl_lock); + guard(mutex)(&player->ctrl_lock); iec958->status[0] =3D ucontrol->value.iec958.status[0]; iec958->status[1] =3D ucontrol->value.iec958.status[1]; iec958->status[2] =3D ucontrol->value.iec958.status[2]; iec958->status[3] =3D ucontrol->value.iec958.status[3]; =20 - spin_lock_irqsave(&player->irq_lock, flags); - if (player->substream && player->substream->runtime) - uni_player_set_channel_status(player, - player->substream->runtime); - else - uni_player_set_channel_status(player, NULL); - - spin_unlock_irqrestore(&player->irq_lock, flags); - mutex_unlock(&player->ctrl_lock); + scoped_guard(spinlock_irqsave, &player->irq_lock) { + if (player->substream && player->substream->runtime) + uni_player_set_channel_status(player, + player->substream->runtime); + else + uni_player_set_channel_status(player, NULL); + } =20 return 0; } @@ -642,9 +638,8 @@ static int snd_sti_clk_adjustment_get(struct snd_kcontr= ol *kcontrol, struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *player =3D priv->dai_data.uni; =20 - mutex_lock(&player->ctrl_lock); + guard(mutex)(&player->ctrl_lock); ucontrol->value.integer.value[0] =3D player->clk_adj; - mutex_unlock(&player->ctrl_lock); =20 return 0; } @@ -661,12 +656,11 @@ static int snd_sti_clk_adjustment_put(struct snd_kcon= trol *kcontrol, (ucontrol->value.integer.value[0] > UNIPERIF_PLAYER_CLK_ADJ_MAX)) return -EINVAL; =20 - mutex_lock(&player->ctrl_lock); + guard(mutex)(&player->ctrl_lock); player->clk_adj =3D ucontrol->value.integer.value[0]; =20 if (player->mclk) ret =3D uni_player_clk_set_rate(player, player->mclk); - mutex_unlock(&player->ctrl_lock); =20 return ret; } @@ -693,12 +687,10 @@ static int uni_player_startup(struct snd_pcm_substrea= m *substream, { struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *player =3D priv->dai_data.uni; - unsigned long flags; int ret; =20 - spin_lock_irqsave(&player->irq_lock, flags); - player->substream =3D substream; - spin_unlock_irqrestore(&player->irq_lock, flags); + scoped_guard(spinlock_irqsave, &player->irq_lock) + player->substream =3D substream; =20 player->clk_adj =3D 0; =20 @@ -734,11 +726,10 @@ static int uni_player_set_sysclk(struct snd_soc_dai *= dai, int clk_id, if (clk_id !=3D 0) return -EINVAL; =20 - mutex_lock(&player->ctrl_lock); + guard(mutex)(&player->ctrl_lock); ret =3D uni_player_clk_set_rate(player, freq); if (!ret) player->mclk =3D freq; - mutex_unlock(&player->ctrl_lock); =20 return ret; } @@ -996,15 +987,13 @@ static void uni_player_shutdown(struct snd_pcm_substr= eam *substream, { struct sti_uniperiph_data *priv =3D snd_soc_dai_get_drvdata(dai); struct uniperif *player =3D priv->dai_data.uni; - unsigned long flags; =20 - spin_lock_irqsave(&player->irq_lock, flags); + guard(spinlock_irqsave)(&player->irq_lock); if (player->state !=3D UNIPERIF_STATE_STOPPED) /* Stop the player */ uni_player_stop(player); =20 player->substream =3D NULL; - spin_unlock_irqrestore(&player->irq_lock, flags); } =20 static int uni_player_parse_dt_audio_glue(struct platform_device *pdev, --=20 2.43.0