From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 B41FA3F1AA3 for ; Wed, 3 Jun 2026 03:58:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780459125; cv=none; b=jh3OzcZOPXxsVOSsz9GWmmpllhwAfXuyPLQfts4c3MU0P+hJtIg8Wk5FACgJfHYtUzR4M//SZi2UUOW7pFrrSl3HiGUimjxz35o2h4lR/Pfi5F61WNqKyTMqzCOhSM81gNe+hTUMeXdXLPov7sQ/d+QjwrD6nlgBloqSOgXoSjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780459125; c=relaxed/simple; bh=xCjeuu7+zl859aKolJL90IgyyO7+SOpa7ucBzKSx38g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cqMXBS3xyhqfejgWLYbWpigTmsw8fqR5mqi8zecFHO+6nKgN0THJInjAZub27Cyh+ry934yt2R3n5T0rOsdczjPM1oDOoqL0YZfXstnpPm4q9WxnY1LuOCgrNxLHruWilYEbtNsSnLtisNqqfns0GDWwlBB05ZUm2QolvEFAHmM= 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=bmvfT/0z; arc=none smtp.client-ip=209.85.214.178 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="bmvfT/0z" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2bf125989f2so39976265ad.3 for ; Tue, 02 Jun 2026 20:58:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780459124; x=1781063924; 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=QqiGW/dz4YSeZ3jaBcWBt4ocDaFmKXFEK9JnLN8NHsw=; b=bmvfT/0zm6w9yU+U0JlWOxvJ6Ji+XpxfQvTus51t9fusEhj+GZ2wGIqHtKvBQgeaTw 3rNNuWUxZgbZHfQX/JSgiK5m6W2CL+IFUUsJGVJMgsJlFg0nvKyxJNtI0pmplTycmowA QICG55tzKyO2hy/Y97t9Lei4umTK7Z1kx+mRUo3bRPnexEskeboFDDWiun6ESmLOsTqq yEAFMXzqDlCGTEsu89omOhVzIFYOL6LOUE8/Kbys5X+TbUcl8QI7JRC1oQPaVDjHlT+4 PXRtyhuRAhUjQ9mYHHhX9JpBc0meAk9UjEnXN49weM5URV3LXH0qk+IpGHp4sFc8EKTz v9Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780459124; x=1781063924; 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=QqiGW/dz4YSeZ3jaBcWBt4ocDaFmKXFEK9JnLN8NHsw=; b=T0CGWyUl6Rrshfz4+g1YT/inAvwWYM76dhA3xuD2sEtnl+pzccaLVDSY9e2peMwV+F I9mHl1A/LraFzqSVySnYn/D4b97ACa4WpIzrmXD+acGRJh1rGwp/NraRNq/YkBff6s0l GbCLmy9ELDA9vxp6cGhFcU+UwfaUpv1BaxMXEGmKch+rZCRPNJQOL5JRjjCSodj5QwCW gF2FB4zuSjJCSSj7jgMMAfjJhegnjEqVSVzb2ETt07scIs1W6p+dNkwp+Ocb8nBBKyTo bumw0o/zNvqgnLTDUSHVk2bnOzCveihj9JlzPgozMytQeJvQ3GsL2vfmL8Uvqm5vF+U8 xArw== X-Forwarded-Encrypted: i=1; AFNElJ/y0+/cInkENI3TIuZ6CCwjRsveMe6b2aB4WqsTsndCMMqQZB7L+KeEWkuNraA6FB9q1OMSm6NxQd0sGAY=@vger.kernel.org X-Gm-Message-State: AOJu0YzFbE9miPQAszR0Mv+02BGD0xVKVgEq7eRJq8OWGxlSrLKqTRvO jeb2t27eUsnhuU3CUsAx5oXDJyXn6t1JdCFG1mgWw2Ue/CGEiwxgJiwpT5vyHQ== X-Gm-Gg: Acq92OEKbOy5mNiuYaQBphIfMCBPzWBtivxOXw7j2SwCGvse5Ugi2Gqs9dy+5xs32Do Xyvs7lMVYhjuADgJkdWBciGsitRhlbX7/86A4ZXVWq2+cAES/2Y1lQbGGFTi/j3cARi5dtVyWNO 38V14eAMOC3lOA+HH/+Nqa1+7efANd6letxbQs2HsA7siIM9aayh+c498V4sVsFsovQGAPutdqJ lk9l4JHphlDFHxHgHkr/4ujq4N/FDsLwLIsG5Udz17a6OOAIF22LXqCxXxhWd24QVuLSttm0WW9 Rk4zs3z9VSg3sxayX1YH9ZCTYeH4m8JNEx/j7U+pbakWMUOMmMl35QAyC33UlV0EiG1vRjKJfMK JAXdFBLsecIdJf5SlW24QT4vQxeIn45u5IOuJyBnqlbyWbK8H/WGJwdgHeg4qKQYgkuK/CfTKby T6O/fVSD6yS+kR2LqP5ZwYfAqykBH0S7ShWhVbWYS0BX25DJr7vyjDyO3spD2f1kX+UtOT X-Received: by 2002:a17:902:e5c6:b0:2c0:cb90:1e07 with SMTP id d9443c01a7336-2c163a12aedmr16797215ad.11.1780459124031; Tue, 02 Jun 2026 20:58:44 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f6e294sm8461085ad.6.2026.06.02.20.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 20:58:43 -0700 (PDT) From: phucduc.bui@gmail.com To: Heiko Stuebner , Mark Brown , Liam Girdwood Cc: Nicolas Frattaroli , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH 2/3] ASoC: rockchip: i2s-tdm: Use guard() for spin locks Date: Wed, 3 Jun 2026 10:57:40 +0700 Message-ID: <20260603035741.68893-3-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260603035741.68893-1-phucduc.bui@gmail.com> References: <20260603035741.68893-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 spin locks. Merely code refactoring, and no behavior change. Signed-off-by: bui duc phuc --- NOTE: This patch is compile-tested only. sound/soc/rockchip/rockchip_i2s_tdm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index fc52149ed6ae..3f3db28b8940 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -285,9 +285,8 @@ static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream, struct snd_soc_dai *dai, int on) { struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); - unsigned long flags; - spin_lock_irqsave(&i2s_tdm->lock, flags); + guard(spinlock_irqsave)(&i2s_tdm->lock); if (on) { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) rockchip_enable_tde(i2s_tdm->regmap); @@ -313,7 +312,6 @@ static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream, I2S_CLR_TXC | I2S_CLR_RXC); } } - spin_unlock_irqrestore(&i2s_tdm->lock, flags); } static void rockchip_snd_txctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on) @@ -587,12 +585,11 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream, unsigned int fmt) { struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai); - unsigned long flags; if (!i2s_tdm->clk_trcm) return 0; - spin_lock_irqsave(&i2s_tdm->lock, flags); + guard(spinlock_irqsave)(&i2s_tdm->lock); if (i2s_tdm->refcount) rockchip_i2s_tdm_xfer_pause(substream, i2s_tdm); @@ -614,7 +611,6 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream, if (i2s_tdm->refcount) rockchip_i2s_tdm_xfer_resume(substream, i2s_tdm); - spin_unlock_irqrestore(&i2s_tdm->lock, flags); return 0; } -- 2.43.0