From nobody Fri Jan 9 23:28:00 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 4dnycc4z88z6MYLn for ; Fri, 09 Jan 2026 23:28:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnycc1RJYz3nFl for ; Fri, 09 Jan 2026 23:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001280; 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=62ZCXTFxYYHO5Wic6GBwkkBiMeIMiJN3VzxaD1FGO04=; b=Veg+ezRrqwEn8aL6MGQ1cxZ1txbnBnFLsbkoMxrXXebTMjPWYJ1NHJtm4H1cAdWg8gK1CM qIncr0FnpiYnvhfTishmrfRVqWV1u751W6Em0ohWA7PGadoV5WYBLLtRkj+NzJAB2n9vIM bPRTlLDeGdQqar+wt2dowzikcxJXe1nKo0pShugEfCfD0f4T0lLI5iKNcwuqmKkkQr0hon dPJc4JNyCJaN4ndVbGKcFF16HgwCUmkAlPeXcnyw2m3TaDDOQfzEGSEKUzWAiElgGgNdST CtoQia1ZM86SCPMMeVJMvBS+jZP212MbXsx/8ooYT3ONSmFeoRFyDmQbksMkPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001280; 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=62ZCXTFxYYHO5Wic6GBwkkBiMeIMiJN3VzxaD1FGO04=; b=fmIqIiJxafLQYQRyOgyRmTz7DFvQDJBnI9jy7ed7Knjj9bSuyLm8Y0kaYxPVDsdvIzHZLJ 9/7wNq6OTYDpaGzk35Wlo0p3ZoCyEmymS+C81ST39gnxGwbCzXAlU7kW+7Olds9JsRceP4 /LpR5wXYgMgNX7uIKPN+ygNiFggkcKpxU6JuWK4Vl7VfvDQl3Dwf5btYbxg8/HHzPsJmrP CQHI/4WxzLX5AqlD/EwZgUM9cWfr5gD0ucyMqvYfY3mCgGodRj0r1TyJBrCr7XmlrRvX9s SbPJYdNK+eKOjqCbKUlOhdPkWMfg38VCnUcgL9jzqTJ3QHvxbfsWB9/e34m7cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001280; a=rsa-sha256; cv=none; b=WjrA/WCNWX30STR5pAgJdYOnuiFBpSsIq6tJgXEw4bxSUwHdU8jcPisz6qNuStsQ1jWiDS 6qJVjSJqX4CVy6xH19p6guuviXZkArYwlMKii1hRxpWigSy52IR7AwZPhxy7pKNlVyiiFY MRiLJeL6+YL+M90CAaWDkxD36hGp9JWAQXRo9JoFcqOhXdRJhCE7RhXoUCELTo/fZtg1kU nBElQ7hVDLCeQHZslsMH6w5+6GNldcfsMzkO+2ilzd/62PucMZYzsqpyATmdc89AAHVHkq gx/OP2u9Art7yvz6d6mu6hRMoC02Yrduo/LP7BaEBDDelQMScGQueWGw1cZYng== 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 4dnycc0y01zTX4 for ; Fri, 09 Jan 2026 23:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:28:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2a8f866ede21 - stable/15 - sound: Retire mpu_callbackp() 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: 2a8f866ede21d6cf8ec8ced7c58d72f73d1f8416 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:28:00 +0000 Message-Id: <69618f00.32d9a.22ad239a@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2a8f866ede21d6cf8ec8ced7c58d72f73d1f8416 commit 2a8f866ede21d6cf8ec8ced7c58d72f73d1f8416 Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:58 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:24 +0000 sound: Retire mpu_callbackp() It is the exact same as mpu_callback(). No functional changed intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b) --- sys/dev/sound/midi/midi.c | 2 +- sys/dev/sound/midi/mpu401.c | 8 -------- sys/dev/sound/midi/mpu_if.m | 6 ------ 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index e0a782bc9a22..bde3c5447705 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -242,7 +242,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { m->flags &= ~M_TXEN; - MPU_CALLBACKP(m, m->cookie, m->flags); + MPU_CALLBACK(m, m->cookie, m->flags); } if (used && MIDIQ_AVAIL(m->outq) > m->hiwat) { if (m->wchan) { diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index 21141a0c8e3c..107a53119cdb 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -76,7 +76,6 @@ static int mpu401_muninit(struct snd_midi *, void *); static int mpu401_minqsize(struct snd_midi *, void *); static int mpu401_moutqsize(struct snd_midi *, void *); static void mpu401_mcallback(struct snd_midi *, void *, int); -static void mpu401_mcallbackp(struct snd_midi *, void *, int); static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_init, mpu401_minit), @@ -84,7 +83,6 @@ static kobj_method_t mpu401_methods[] = { KOBJMETHOD(mpu_inqsize, mpu401_minqsize), KOBJMETHOD(mpu_outqsize, mpu401_moutqsize), KOBJMETHOD(mpu_callback, mpu401_mcallback), - KOBJMETHOD(mpu_callbackp, mpu401_mcallbackp), KOBJMETHOD_END }; @@ -235,9 +233,3 @@ mpu401_mcallback(struct snd_midi *sm, void *arg, int flags) } m->flags = flags; } - -static void -mpu401_mcallbackp(struct snd_midi *sm, void *arg, int flags) -{ - mpu401_mcallback(sm, arg, flags); -} diff --git a/sys/dev/sound/midi/mpu_if.m b/sys/dev/sound/midi/mpu_if.m index 835d887f703a..07371a0dd726 100644 --- a/sys/dev/sound/midi/mpu_if.m +++ b/sys/dev/sound/midi/mpu_if.m @@ -44,12 +44,6 @@ METHOD int init { void *_cookie; }; -METHOD void callbackp { - struct snd_midi *_kobj; - void *_cookie; - int _flags; -}; - METHOD void callback { struct snd_midi *_kobj; void *_cookie;