From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C933306749 for ; Wed, 13 May 2026 14:10:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778681428; cv=none; b=hBMmlt4oXu2n6hwoHUgDPTEoox2jtfGI/XiMGyY2McXWPy6fU7JpB8/N+Okc6bYzR6HnrMVG10jH0MuTOzJ7bbXfQVkyt55GRSJrEBeNtxiL9KziFIdaun6/5Hg2RyoFA63usAu0J1aGTZqDHigd5A0a5P3Eh3xIDCcpn+npIJ0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778681428; c=relaxed/simple; bh=M5J5V5W+7YV+8lG493+ZOf8NspeWjtqB9v7iznW1ke0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tewUUcvtiYY3Lpt8XvAOY53kUiUoTQjVEC4t/KrxbIf3iDFnmGlHX7EAHOUz7g7N1BlQUTLvyGlJBzxzHE8lV+qUYNqPgBNZCcqVPs+u01aJVzOKS0oLAjDqObsC1T6vGtXW0P4bnPdE2lthePf8indvYJEqExDWH08hH8bcJuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M9zAfcIt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M9zAfcIt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7135C19425; Wed, 13 May 2026 14:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778681428; bh=M5J5V5W+7YV+8lG493+ZOf8NspeWjtqB9v7iznW1ke0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M9zAfcItn9MShIsL4v+wcftUueog6j5nO9xY/YJJ4YTquWCcZ88mRAJFadJckuJYo JMJ5cmNZdBceHaAfwmb930Jqd8cgbSRaC2g6jS4bop8KwHHVwEXGRi06O2x/ega3fK Uzg9vTl/ATKxZM4pbRWFYQEpa+3dmSboQMrAZsr3POm5tcdTmuh1YwbxMK5PLneLL2 +3Vr3RIYjmCoD5hYdSYLjq8krJKadJRIhPzxGUg33hqyQp2Vnok1bnsReWRXr1fzGw Zgj1fqmH4xDDPoGyCbpT2m3/XXmUUzFRY4LEcFuHk0aK7yrrMXYHvqHIlGSBa5kSSD XSjeaRJMZYjfQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin Subject: [PATCH 6.6.y 1/3] ALSA: misc: Use guard() for spin locks Date: Wed, 13 May 2026 10:10:23 -0400 Message-ID: <20260513141025.3748103-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051250-tattered-mulled-92f0@gregkh> References: <2026051250-tattered-mulled-92f0@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Takashi Iwai [ Upstream commit b8e1684163ae52db90f428965bd9aaff7205c02e ] Clean up the code using guard() for spin locks. Merely code refactoring, and no behavior change. Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20250829151335.7342-20-tiwai@suse.de Stable-dep-of: 5337213381df ("ALSA: core: Serialize deferred fasync state checks") Signed-off-by: Sasha Levin --- sound/core/misc.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sound/core/misc.c b/sound/core/misc.c index d32a19976a2b9..a6dd4d38a46b3 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c @@ -198,35 +198,30 @@ int snd_fasync_helper(int fd, struct file *file, int on, INIT_LIST_HEAD(&fasync->list); } - spin_lock_irq(&snd_fasync_lock); - if (*fasyncp) { - kfree(fasync); - fasync = *fasyncp; - } else { - if (!fasync) { - spin_unlock_irq(&snd_fasync_lock); - return 0; + scoped_guard(spinlock_irq, &snd_fasync_lock) { + if (*fasyncp) { + kfree(fasync); + fasync = *fasyncp; + } else { + if (!fasync) + return 0; + *fasyncp = fasync; } - *fasyncp = fasync; + fasync->on = on; } - fasync->on = on; - spin_unlock_irq(&snd_fasync_lock); return fasync_helper(fd, file, on, &fasync->fasync); } EXPORT_SYMBOL_GPL(snd_fasync_helper); void snd_kill_fasync(struct snd_fasync *fasync, int signal, int poll) { - unsigned long flags; - if (!fasync || !fasync->on) return; - spin_lock_irqsave(&snd_fasync_lock, flags); + guard(spinlock_irqsave)(&snd_fasync_lock); fasync->signal = signal; fasync->poll = poll; list_move(&fasync->list, &snd_fasync_list); schedule_work(&snd_fasync_work); - spin_unlock_irqrestore(&snd_fasync_lock, flags); } EXPORT_SYMBOL_GPL(snd_kill_fasync); -- 2.53.0