From nobody Mon Mar 30 14:13:24 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 4fktWs4mqqz6WTC7 for ; Mon, 30 Mar 2026 14:13: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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fktWs3BBlz3rRb for ; Mon, 30 Mar 2026 14:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774880009; 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=9Le+QZZLTs7d2kbt+xatWmeFoImfThkn7wLd0LpBqig=; b=wdu7x9IRZ8/rviylHQEWmTkNYHuC/1TM3L4Uk1c2qRXmKRUXwKqpZGTsRDFfyFm6mVyBrE cAQy5/tBvOa4T1pYj1iKCSLdx9ZidUxsluEoZWqVAPbGs6K7XrWDSrDLrRR8XQCdKwiGL1 QxSdMoOpIgjZn8Z1u8qs0Am+eSKafnfFsSSqHWMkibu8DyhjgUkh3EV/WsKCAebRJr7i3M szKEWyClpc/IvyQE/KasRFkUSxVGEnnSurbJqOH2FDAfsFWjEFGpwGc0DRKdGdrULnVhhX VVG7Oe1GhoqGld/uDdf/yPItw81JP3K1P7QTZmqdhXMXmzPRGe62x+Nmx0T1tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774880009; a=rsa-sha256; cv=none; b=iHNSEFu0jswE9JonGPyNJwvGn3UyzDpK4VijZvkoZozbZCApMvntnx2k2SUZYGvJY7Qyie gP4RKQc8xBCIprXdtWYdqBkYIS9Kjkern2yr/+e+5w5IyUVFA/mU47PsEB3l87QPHSpXqZ aGUR7fmt8Fh5CnUuJ3fsBj/MZO2R9mmPnK8CeD/lPfcsH7E3R5CPYtwDqJQNavTYhO2RAx IGx1zJhXUsEwm50nOeUNLysxafYx/OPoQPa3J0QnRJF5eXoX1K1FTvT7ohspQ+yBaLq+QS mxo2xQt4ri/SInNVTsvBxMVt4x/u9fWD9Q8eUUWSBLCp1bqcMkdPhweFRjS0yA== 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=1774880009; 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=9Le+QZZLTs7d2kbt+xatWmeFoImfThkn7wLd0LpBqig=; b=iVFFtTzv77lqVozBD0Sb/ECPxwTlzwYlowS6QC+iI4gImWJ5hhfAxZ7FRITP1nBZ4uD+WS 0QB88bBRmMIJZAbIMH0NdPHcW4EilQPtDKm1ob15IfRuIKEpvknHkKkdEKWsyUGojRGMQ7 /xm3drWCt55JNI0cb7badqrt+v4aqorN8QmVT8blCcztQQePOrmNo5pxrZ2s4W0pQFHT4k 6aHz3RzG1dj2iCfHjH2R1tzBAQWtgOClK7axl9xD432YEqkySPw7/KBQhQV6RvtJL29weU 3gdIEUx7Npbz0vCbTYkVC2hR6DBIZzf7fY/p1OQmaDBJLFGdDTd3j+vzjbSl0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fktWs2mjRzmfX for ; Mon, 30 Mar 2026 14:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2609c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 14:13:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0efd33382504 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0efd33382504d3172734fa21325fcabef9c7f063 Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 14:13:24 +0000 Message-Id: <69ca8504.2609c.5ed38d62@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0efd33382504d3172734fa21325fcabef9c7f063 commit 0efd33382504d3172734fa21325fcabef9c7f063 Author: Christos Margiolis AuthorDate: 2026-03-30 14:13:16 +0000 Commit: Christos Margiolis CommitDate: 2026-03-30 14:13:16 +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 --- 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