From nobody Fri Jan 2 16:58:36 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 4djVJY03Pmz6Lvwt for ; Fri, 02 Jan 2026 16:58:37 +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 4djVJX3VFmz431n for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; 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=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=Cy8fSkCkT2wXz/x5iPTK4f3z1P9qHtS+gNXM3gQkBFfscf2LpZ1Z8IseHM8TJz/pQPkdDL jbBNmuTbUrwZ1NPnwGF5YAkT8N6Y0XMebIsKixB4ukf5TIOpW5+R1ImM8bAlF6xH6hmjlb ReuZ2FvB5kfoFIiH14AaI36kVnWHGvilI4AaVDdVKfxRLaINB3VlZJjrDDutCmh88TZjKs QfUjpF44YeagZqy3C2/xCycO/eettqpOug6Hvez0FqSnqFNY5pCGwqatfMbR3/lJMZsb+9 wvee3uOcar48EfnNk3ppSQRhsUST9tub7ZgKy0nADzWnPH5ShVXgtpfWIYvQCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373116; 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=DSDbGNN/QcIMXmmW3yi7DYNs3NK7P6nvl8TVtwjYn9M=; b=nX6+SzzGMOsN5ZYIiET+rqK1XWXVg+hzIPZ1Pv+z5RLWKwI77c/A+wA74Pux+wTBWraCdy pu56vPnuQaghNxAcw0sOYZBubU6LJtuMo1dDCMq65fK81o+8CTgKw40j6G2Pi+Jf1LubM1 mdiS9rVMkwQybi4qqpvbPjLXO+kXZxwWIchGq8G1xn417IpXtkMHzrGS2DYTPci96UURbR QtyJVwNHieNCVvyJbRKTXbh9XuGaGhyVyD7qp5YIblxB/3UWrRjspQXxxvbw/d7rpKy+Gm we3JYMdvl5x05LZuGivoazJIpWSainlGyGskzugutbNNcNLnykey8PLe+GqtXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373116; a=rsa-sha256; cv=none; b=x1jiu0rUZC4+udNtTmBkWDTVccrZPSbrXs38j29EyrG6yomNurRSaVrx0ACKhfMuv0oU0D XLMBIUddE9HkFG2KoIQaeJvIu4uJkD0ByLAqxRGrixORWaMMwL3txt+q4yDE13RiMXETRZ JUj9S2j5Z73nWY2h80Lwcw+J1LVdRzS43ADb9/4EuiwY4RDt2bobpWhD73j7FKCJZ+v4cB uFN9fc5jBclrI4ZvsB09OhFrMw2eyk+EAyQ2Zl7Em99ERxQgikUeSTjfPI8lQjFH1tj+Hf PfVgqXNDk84ymen8Q2eBzvjECiWSRJYQJ2V9n+JH6s6z3Lrx9T628J3rvaKxqQ== 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 4djVJX2PpPzBQK for ; Fri, 02 Jan 2026 16:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2295b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e3b57ceffef0 - main - sound: Retire mpu_callbackp() 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: e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:36 +0000 Message-Id: <6957f93c.2295b.31c31f60@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b commit e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:58 +0000 Commit: Christos Margiolis CommitDate: 2026-01-02 16:58:06 +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 --- 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;