From nobody Mon Apr 06 09:19:05 2026 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 4fq3g21yNmz6Z5gC for ; Mon, 06 Apr 2026 09:19:10 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fq3g21Xpbz3F8n for ; Mon, 06 Apr 2026 09:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775467150; 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=4FVt84l06x9/nWVvYxbvwpOTXaGpNXs58cykMSw2Uvc=; b=g/hSPDEtLiVKZnyPCqyo1JWyAniGi5gOYXVEke0WvYzHJ3Dt78LO8/O4ERFAOBxWtiR2Cn oIu2QekmjpGvJKnqMIT63HWclpei5y2rduHwQtkpSVvwDERJVAyic/Zqw/tZO4vq+defB2 NiyYDem0Q2oIxT4h47XXwkG27yQfefVd8mdhnSaTDas9TGVGebNufiwxN3t++2Om3iWFNo ZqLDmwmNEQAi71BdgiCXiWs05kw1PPGozQD8KOTFuc4k4G2yoDuRe6P7YPfxsjTXrWo3Xl 1DyGAhCdI0zuqbpSbzC8PEHj5y/xSHJ2QC8ae7C3hN3hIq0+MEo6i6aAxoPJ1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775467150; a=rsa-sha256; cv=none; b=lZRcOtKSUGxToPxXwIbd0clEKbD8XUMGi1uCqRmo/J2dLpHJ4EEgkQsSeErki19sCjjcYk bzyRhGejHz4NcUN+TdC8VtuVobxQmUqsEdE/NxdJl7+Oi/Vc1qNqnUpu+8uB2cFsKdi6EI I+zfSQbIdBiF/OHS1chWcZ+ACbxu4p9CYcjADF4D2VBxMmiAqFlu3UbgkPoM8e8p+Ozny7 iWHE7y3XMkyfMS3dxyjWpY/njgFz47Ij1HWgYLEU39ZsvldJ3blHc5Y932fZRd2cbyT5u4 CCAm7lFaPzUDQtDDpnOrmGFhA39w9D/oNa/4H4mP78Vm5NSdCGYBGKa/p6/rmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775467150; 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=4FVt84l06x9/nWVvYxbvwpOTXaGpNXs58cykMSw2Uvc=; b=qavih967RI0ASuQSe2tCskGqzDQEr0cd+8ziZ2AwZ7keStgOdLeYtyCSjbQHr3+8Uy5cy7 sjiiCzl+vjSDzpLiBNyFk7Lm87HS5g2IgzPtuM02R7I03UyLm9vFJrtTkoz+UmzMSXzQiA fI8GXhyU2WHxzHOMZhR5EKE+DEpN0lq+uZMa7I0KEViDzAnlUr5QD6NNr/Lp8jlBiQy4U/ c/gJqRi8ZQwURifmHS2wEveXVhjAj9GcwdFftDH+Z1DhAcp35HGeFE+MsKySdN4He207/q si+PjFTCx8wu3gJp+Tuu836sVJsz8ykIIX/fFdrYgRwu9dtz5EEw621Lb1zgmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq3g214mRznBR for ; Mon, 06 Apr 2026 09:19:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42e8d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 09:19:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5c36d1b5c99a - stable/15 - snd_uaudio: Retire sndcard_func usage 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: 5c36d1b5c99accb632ee7fb0339e495aabfb5706 Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 09:19:05 +0000 Message-Id: <69d37a89.42e8d.2f5c9719@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5c36d1b5c99accb632ee7fb0339e495aabfb5706 commit 5c36d1b5c99accb632ee7fb0339e495aabfb5706 Author: Christos Margiolis AuthorDate: 2026-03-30 14:13:16 +0000 Commit: Christos Margiolis CommitDate: 2026-04-06 09:18:59 +0000 snd_uaudio: Retire sndcard_func usage This is effectively a no-op, as it does not make use of the sndcard_func->varinfo field, so eventually ua_probe() always succeeds. Also change ua_probe()'s value to 0. There is no need to return BUS_PROBE_DEFAULT, because snd_uaudio() attaches the sound(4)'s children with bus_attach_children(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56160 (cherry picked from commit 0efd33382504d3172734fa21325fcabef9c7f063) --- sys/dev/sound/usb/uaudio.c | 5 ----- sys/dev/sound/usb/uaudio_pcm.c | 13 +------------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index dd8aa8c9fafe..65976ced8a75 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -367,7 +367,6 @@ struct uaudio_softc_child { }; struct uaudio_softc { - struct sndcard_func sc_sndcard_func; struct uaudio_chan sc_rec_chan[UAUDIO_MAX_CHILD]; struct uaudio_chan sc_play_chan[UAUDIO_MAX_CHILD]; struct umidi_chan sc_midi_chan; @@ -1112,8 +1111,6 @@ uaudio_attach(device_t dev) /* attach the children */ - sc->sc_sndcard_func.func = SCF_PCM; - /* * Only attach a PCM device if we have a playback, recording * or mixer device present: @@ -1130,8 +1127,6 @@ uaudio_attach(device_t dev) DPRINTF("out of memory\n"); goto detach; } - device_set_ivars(sc->sc_child[i].pcm_device, - &sc->sc_sndcard_func); } bus_attach_children(dev); diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 0b3da9b20440..c24c111f983c 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -190,18 +190,7 @@ MIXER_DECLARE(ua_mixer); static int ua_probe(device_t dev) { - struct sndcard_func *func; - - /* the parent device has already been probed */ - - func = device_get_ivars(dev); - - if ((func == NULL) || - (func->func != SCF_PCM)) { - return (ENXIO); - } - - return (BUS_PROBE_DEFAULT); + return (0); } static int