From nobody Mon Apr 6 09:19:05 2026 X-Original-To: dev-commits-src-branches@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 4fq3fx2wvjz6Z5RG for ; Mon, 06 Apr 2026 09:19:05 +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 4fq3fx2Qnjz3F8X for ; Mon, 06 Apr 2026 09:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775467145; 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=eja01JNgFfMf20YaJ7DDcW5Df6DcnxHCOBb2F8T5sRQSX1UWCRO411qAwoqYzHynN4wZNS 6zUmPOiHLOAU+2IwSlBhetiuXKDhDjkF96o8JoOb581w6R3a2y6uFMFmpu6rMplH4maIn3 U7ZPudqzGtzlW2IyTyCfQrBgHNyr3Y/nCd//YiiSPPmjvbc2vv5V+Uz8ExBiC+uIfhVjQZ sm2mlSzG+bTxzKrZnzVSngtHZ44yYn6vWb+AlM2glIDtHFSvChghKJ43Du8ZHqj7TU7K0m IzPDwZVDLqRl/o++60Endu85Veu1rBgVDhF3++U9RVpUpxZlixDIg1J8BAhjYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775467145; a=rsa-sha256; cv=none; b=lhIC8rXQ7BDq3mXFxsD8luD5ES6QV1Gp/PnB/aVh/uYVLBMEtyVcYJCHXP83MK3wpXfs57 rbmWQlJy2aiXfgsSQUqHtd+8V9thGbIa9HKnI8yD1ZjguR9WWSynI3xrahQGyNKp5GYbUU DK7X71VTwlpyGKIpKVfFqDuz8UwARpDQ3EJAui1PVakU6r74E9woVpdkU7MLeU1w+PedHe 499o1Ol4nZmqXI8jzY3kxKi6YQg6Y1n8Mj64SerrMLI+6xc785hWCY7WNT/2a6ANsmAL+V 4GmCkvnid4bz1MxJeA4QTTHWsAu0oC62+KLGx5Fm5yQeRNLxaKRpUis2hjeEoA== 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=1775467145; 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=eL8L1WkWH5D1cC/cMtJY4eFKONSLSiXj16F/IIvFzIswrWwuGr4BVVnFF2ydV6dN4HWZGw W7qo0VIj/E3w8fzAjTtu28A7IF6A6dVDq9GfGnfampQsTuq/M7+kOMj9HXR25NFoP+chmo Nqm6xymumm5aBWnWRnwIqIwovVrk5J0o7TN3SMZFnKPuVTUCSxT9UF2h5Lj53BJOUxSD7q 6nbmhu27SYtMjZLMljQuSCjJL2uRcCPFMle313ddbiDn5NxnG9/kISrKSo5BUqzGXmf1rP cBGg/FgZxYTYvCWMuyP/m0kVxpdk/NJGSG893WaLBnOyTSZlaQmeiYkpnNoJSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fq3fx1R1qzmQr for ; Mon, 06 Apr 2026 09:19:05 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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