From nobody Fri Nov 28 14:35:29 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 4dHwnY6dG3z6HZb9 for ; Fri, 28 Nov 2025 14:35:29 +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 4dHwnY3rMbz3sLW for ; Fri, 28 Nov 2025 14:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340529; 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=2H9kCFQJNR+maWyk48g0ekdqwjmWxEbJ3ecuTUPqISE=; b=vGPLMfduVivWGPoRhvIUUVfDE0QxcsJh0STEDW442OoH3tVAsX5ueTqI2TFKrm8On5UkWO HsJAB6RwzAlDIxkY8fTSqlccsq12G74U26gg51cp6H9y4gx8xHJFr7PigIKIXo45nIKmF2 thiKKFnTerS652Cm5R2acKh8eKEoOyOdmodBgr7fySJAVsmAsPKGED8dnBCElqNRa2BKvJ U2w42UQMeYi+Xp2B5Scl63+zd5/QDBkpC9Z9Iw3mwUSAehij+gBar/ndK/JGZyp3ewggP6 B3MCCdF2x7ilRV/Yw4T8AU97RbfrestqJtOdnYLtKT2KWSEwj6n2IHzmuktRdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340529; 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=2H9kCFQJNR+maWyk48g0ekdqwjmWxEbJ3ecuTUPqISE=; b=ZQ2yoXrRkJMvQA/FrnmvVvXuvlcLtlcpUHwSNI1w90XrbnAaHGZ0nVvuO7gUdgRMHuiQhu vuWqR8F0WQ+NNtfL+aDgN39c2dFGaSwSiEJWjCXXJbv+3P7906/7KLSh7YzwVex0+tDtJi yj03DkYzuEZHc9nsAK9WWGi9C0wAwHH60XnvlqfWrhZel5Wb0q/GjJTJtoUKXjbYwFqEwx IIBY/BvUjnbNncqxd+QIsH685HGebAlF5gCocVhtKKfVj17KOcONwo0msZPkEl5f47l6io dPMIIlw6SY2eTX251xt0JmNSToCG3rywNiojWG14/BOQRFHkegbWk3bTwbKQbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764340529; a=rsa-sha256; cv=none; b=xcXP/Zkkf4TTiKQk3LfLV/PhjhMQCLpXHKsp/qGfiHTSzRkw8hkD2dCi680q3B+8BEZA2N lj8OenkPa0cNjp8Hredk3VoEwQMBkX5VH4//cg5KtohdlQ8uHWQk34cOq+qy93kOCrCC/v MWtXzCyjCmDImVbcnx6rsLaMc2lzZs4eywGtTCY2WX5klGT8ktZGb3QnxydvyV2maVuoGh H0rkSi9NnDlzRfybmNe4adI0V7NOJN7cuEe+rKnciGZXLX1ig+ImvW05TCVpvp1vbQ6/hx tI4W9Hxw3mfXGamnIWWqbT3q2IibSIi6X8qiuLgZArXLeZIzktttKyOUFPXo4w== 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 4dHwnY3RyGz15sL for ; Fri, 28 Nov 2025 14:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 28f78 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 14:35:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 839da868a5f9 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 839da868a5f9eb8bddd20d44f1cd0f293c5685cd Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 14:35:29 +0000 Message-Id: <6929b331.28f78.6d1edb6d@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=839da868a5f9eb8bddd20d44f1cd0f293c5685cd commit 839da868a5f9eb8bddd20d44f1cd0f293c5685cd Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:24 +0000 Commit: Christos Margiolis CommitDate: 2025-11-28 14:34:41 +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 (cherry picked from commit 3107b952f534813846e4f58afdb57624a81618d8) --- 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) \