From nobody Fri Nov 21 16:15:00 2025 X-Original-To: dev-commits-src-all@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 4dCgKd3HPsz6HQBW 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 4dCgKc6Vpyz3xpL 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=1763741700; 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=KMFdhaUPcZEdd0sDR4Zm0JHHtYbfeSBFXzJg+E9UZX9KQFlJOUCPcQ2ufvH3hftmVGpEYf i57JmqmHpQJnrMRrxA3tt7DWh2StXgaFtiqSN8gJMKPa/Do9aoeSdHXbEt/b0K76rU4m3f lCK7UbkmPvqZFL39VgHdjMI0Ui4wc46Ta0b3hJR1V8uVvx3otowoY/jaIrRyn8kepQ5HMf 4jK/F3PuKmDp12tYRV0ghdXX78wZPlbygmEN2Anu9ec+Mu+jGlhLY14W0rEd+nevnpAUKU v5LBrrHZRDuIf5aZpDkGkFwP1ofo4SV0Obj5QA//5txPTnYI5lUPgiWFQzYcRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763741700; 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=HJB/8EAIwIOGJzYoKw/QZ196xDxUj0g1zcBIrQXUX0emLXDd4E/iGgpyyIpuAYEy2rVhEB OdQQH13BmMVKzKiHg2soldQqsPjO5g8lv7sJMBOxdpNxbBUF4ixZd1oX+HdDq98rLFRNEP bAPITbK+rUMLDDftiD+Rn3E/f5cE7szHbzu9xT+yXtImdVX1fiIwVlXY3i+hnDoI+HF549 Tew8XGCb9iDMSsrCUcBnPrTtwHZ0XflDyC7TdfdxLHtWQEXxlx4bLlm4cy3a6viYhtvjDM Wor1EBxE+siJoho60ollSXlAud7X6riCh5qBqqDnFH7lTVvApfWnlJCghFO0Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763741700; a=rsa-sha256; cv=none; b=h1CJwjlHa61k6q3vvbIACB5tcxA34eED/ux3f3TbThkQcfzbMLL+qb7ti/rumAS7MhjW0+ OtizaTfX9PBDX+Rj+jHboyZvLJw7alHsyrPVpOwSPXDF0Dx6S4ylAansuhBRg+SdcdpIy4 b9Y8vEkWHxpYVdGpby7wBi4avvv1ZiAfwijWX50S2a3tapy8fSkkkjv+yEj1NCiismNhQh EIZ9n4NxDG0fbLTEcKH5nInWKCIQdMqliQU7koYxDEIHMDG+9pH8G40He14yCat17FKVd8 s1xmTwoj8EKmtZRNsETiGXMayC8aEggcIFtTsM+n/zfVrrOnD8FFjzWsxBUoVw== 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 4dCgKc66Tcz3x9 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 all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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) \