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 990AA43E9C5 for ; Wed, 13 May 2026 14:34:36 +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=1778682876; cv=none; b=Nx6RUQrnlKbnPxC6WkjBzr4hS164+eIfNhJ+JSjwv0bVTeb5KL6iP7vfUWAXmVq3d5kVGWMBB8B9dnIfp2+xcvEwEyjyNJ1kVw63rUJWxXHmsmrXCDpC17EvLLc9vXqGl60/m0rsypW/SIaFb2VghZbM3gZkM5ceQuMy/pRmEv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778682876; c=relaxed/simple; bh=M5J5V5W+7YV+8lG493+ZOf8NspeWjtqB9v7iznW1ke0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cSDcBsHTaDm/kKhiPPbmmfpDssvYjZKQbt7djTgpNON8RpYA0TTQj8dnPRUzDYcjEl3nXwk2sasM2+991wBXJH5SWxOahnNaMPz2FdOlwkQW04ZSLDe8fFtgtBbAA1TD46tKTKYXDuZgp3PFS8Ai7x6t7vCJW1PqHvY1V4S0zb8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J4FspgXt; 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="J4FspgXt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7128AC19425; Wed, 13 May 2026 14:34:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778682875; bh=M5J5V5W+7YV+8lG493+ZOf8NspeWjtqB9v7iznW1ke0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4FspgXt7qyiKtdAkGppXn+M9sAqDl2tNeiEO313nNE6wtFyzBFNfS4w6z6YBC0hR x1vzm414vDh2+TDBY4l8i3nPEUNrhT/PYWQ1xH33Ab0dc1aKPrhtAw4YZwziukcSLj unOfsG8RJHYGXNCw2pIBWN7VMnxq3sMj+t41zwZNWTFMg/FUYo9GQzRmst+XNHZerW 5NJzxYELPm+RLey/MIup+FAeCXx96Xv7Jw7pLW2VG6omX2Zw+IiYhWcBI1cQX574Ps E32vHDuUljeEMedg7a09fTfBE9WLy0/d+IZAJNVmhQNyhfE7ixG4D5mkvYf6x8MDwD vo5XwftBxZ7yA== From: Sasha Levin To: stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin Subject: [PATCH 6.1.y 1/3] ALSA: misc: Use guard() for spin locks Date: Wed, 13 May 2026 10:34:31 -0400 Message-ID: <20260513143433.3755085-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051252-doozy-thyself-9752@gregkh> References: <2026051252-doozy-thyself-9752@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