From nobody Fri Nov 21 16:15:00 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKd3HTdz6HQBX for ; Fri, 21 Nov 2025 16:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCgKc6bd4z3xtj for ; Fri, 21 Nov 2025 16:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1+dAHBV3ceK5RMaSy82nUJy5a8CN2++veaFaoq829I=; b=Q6QG65Vc92BoPyOMIK2vjP++la/hhl10cOy8xZgL2QLaDby0BUKluhOs/Ko6NejL0zVUJF 3fPbldrC5jjBJG5UvfYFfBKec4n7cHjxdE5hJjCKSQxCoLEXJgsktGMRR442mls5qHcv1w 1AnrfyHsoLJI+sicNtHq9hhdYIjooi+bD+3AlW+Cw+3BYnuaMyMbNcyc6u1CO9AbyjgEu+ cyeei2++VrLiOpaHVt6OgI8GsSN35ckAxQlvNavTl5PIUgIVllVYRA4iYymZ56Zl6585wI EWjzgwrId+9pSt4Ebj1yy4wWqRr4lr6fF5y6upobpl4foBGkGCDEyCwYNpF34A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1+dAHBV3ceK5RMaSy82nUJy5a8CN2++veaFaoq829I=; b=VtOEGd/ztHawSq4ZoU4JiFSNhPhDFo4oKTFUa/pqRPQfjNvCfECkTyb63zYhrMQCLM2Jse IDRP7WZYc6vZMEsu04khrYyce5ciZE5pz4mHOjYx9T9K3Kpga/Oo6NWc+R0EG4Uh6MJI17 PbC+USEDhuyrwC0aPbBmAMc7rUXo7VigOW33q0zYxiAt/76FMqTx+oUXmnVCYrB4ihMfmY TCYH5Q/xO8QWXaGaQTzmrL3rptclqQeBfXaDiiVkVbpVlGx6Of3uYRWI20nlRt2kwU+1dg qBHCiXhBT2UsRGME9OwjEuck0F3b7dWZh7DvwcN3Oxv/Bkt5qnirGpbFrfZPTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741701; a=rsa-sha256; cv=none; b=SfXpWWqjvWrzaRIxrx2+eTd9Wtn/aWMgdjSrvyttY7lr2Mzt1znNgsShZWeLuAqkYEXgMg QLe3rMcFgeunc2bZaDLaOpQxVr1iyrOD0s9o2MWOyJ5hkGsFJcub8Mrf99dddQnN2kVJF5 yT15ADTczxx9UyKurSt7uZRXS2Rd8xqs3zuZr9+Yz4ukZ5ZClKcxeFoSVy995SyGSbqw/V ch/iJdHhLqnw7+oZ8gp0mHRsimddBriLrZ1JiSmYmBnC/SikELSzds9Ce/gv8kjYtLN2ZW LI2dqHriEmSwW34VzG8O3qm3mf5PyYQC/Pas4Du2jPUTsW1hCsDDJG4O+Zu6mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCgKc66YWz3j6 for ; Fri, 21 Nov 2025 16:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37290 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:15:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 3107b952f534 - main - sound: Merge PCM_ALIVE() with PCM_REGISTERED() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3107b952f534813846e4f58afdb57624a81618d8 Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:15:00 +0000 Message-Id: <69209004.37290.13d7af8d@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3107b952f534813846e4f58afdb57624a81618d8 commit 3107b952f534813846e4f58afdb57624a81618d8 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-21 16:14:47 +0000 sound: Merge PCM_ALIVE() with PCM_REGISTERED() PCM_ALIVE() is used only in pcm_unregister(), but it does not hurt to use PCM_REGISTERED(), which uses PCM_ALIVE() internally. In fact, it's more robust this way. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/sound.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index cb510d526fa8..60236eb4c69c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -467,7 +467,7 @@ pcm_unregister(device_t dev) d = device_get_softc(dev); - if (!PCM_ALIVE(d)) { + if (!PCM_REGISTERED(d)) { device_printf(dev, "unregister: device not configured\n"); return (0); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 8542a96ccb14..c03ac2c8ee58 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -133,8 +133,8 @@ struct snd_mixer; "\015PVCHANS" \ "\016RVCHANS" -#define PCM_ALIVE(x) ((x) != NULL && (x)->lock != NULL) -#define PCM_REGISTERED(x) (PCM_ALIVE(x) && ((x)->flags & SD_F_REGISTERED)) +#define PCM_REGISTERED(x) \ + ((x) != NULL && (x)->lock != NULL && ((x)->flags & SD_F_REGISTERED)) #define PCM_MAXCHANS 10000 #define PCM_CHANCOUNT(d) \