From nobody Fri Nov 28 14:35:28 2025 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 4dHwnX5hGlz6HZgS for ; Fri, 28 Nov 2025 14:35:28 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHwnX33Lgz3sTr for ; Fri, 28 Nov 2025 14:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340528; 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=/TrSwgmTfVou5qiMufO1Y4wwAo+hnKyevNXLF1DJpp4=; b=UuRGii2R4wqRpBBMbtJzG4ldGZ9cW3Ocj6isHpAz9942SmotJmsTI6fPLvEi4xHQEpiB1Y HruogMdscPiT80bV91paoQLmUPE3ualHMUNh07pbDejYzwub8gpg3Lihlzp8Bq+kKLkv6C tEAjKj7t7sBkpQVj3qWeqOVNoW+eX440wMqETxSSH96gNnXPkLgEv4Lkf8C7dk3dte/QVp zRMsRwv5e2+7Ug66G9Uq+4S0mVBC8CegqlmNa9X42wyH3Ls62zkf7UHgguwZ0pPXqQoqJi A0IRCLsEnvLfyEWSjiZ9Nar26X2tzaIMlz44uUnRZZz9FaQDm6WV0ni18ZDPpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340528; 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=/TrSwgmTfVou5qiMufO1Y4wwAo+hnKyevNXLF1DJpp4=; b=X7uhBP4dyqeHbDbY7op9erIuSSLlodeY07qX2FympRsgDVUtL2x1VS+bra6GOn4V/FVwS8 qarER+eek0ZHON1ZHSNGSHDRcnt5dNfTIAcGqcMxXif8Axc+orjnCsc6RzRfmBH8IZEq4g Lu58XnOlONFr2lWSDjf4TPkzXKv1Df1CubgGQQJO/kEQ1HfpmrsB/c+eCRrwWqmS0rRANh YHl/SDSEOVNwiLcFRyz9d1NzjRZIYCjzbBdi5kdZfjtYKz2ua9a9+SQPa605ZSUpJZaDE1 Qi57Cau9pYpXIg9UxM0vKawbT//UCyJufHghg5oni1l55DvtlqcwLIX/lW1/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764340528; a=rsa-sha256; cv=none; b=nl9Fk1P7qdMI0kvHS8kFsURjYQJ1O7j5u9mlsRkGADmjgH9NEkd1iYh2KumvEBbYH/Ydhi BjKHX+xSIxjIpvc9aF7BL5gewGP065+QD3vLGhqWyJ7aHmZRLr2zWIzNrr7Xm5VZy9tphj eprtv0xFB1FzwUWyDjHUjOR6fXYacGrYfbvNHn7c8mh+AGdOq4FzGlnwKbvk92xdjTscq/ jHWUjKMaY+rk+4NDwe5/0XXUuAa61FOWBb8r09viE4TZuf0bORi87ncOn85KDKt6rL/vRo pNCX0cLg20u0x9N4vMaeRd5Z/IlAl2p9cizY7RlhiYLb8rX13Hs8jsbhIxMRMg== 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 4dHwnX2fjsz15kb for ; Fri, 28 Nov 2025 14:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2a6e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 14:35:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: efb513fc19c8 - stable/15 - sound: Clean up midi/ includes 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: efb513fc19c80e814bc04b018492b2235cade928 Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 14:35:28 +0000 Message-Id: <6929b330.2a6e8.2310b424@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=efb513fc19c80e814bc04b018492b2235cade928 commit efb513fc19c80e814bc04b018492b2235cade928 Author: Christos Margiolis AuthorDate: 2025-11-21 16:14:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-28 14:34:41 +0000 sound: Clean up midi/ includes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53841 (cherry picked from commit 4e8eb778803a8bffd0faa507ae2662725363cae5) --- sys/dev/sound/midi/midi.c | 23 +++++++++-------------- sys/dev/sound/midi/mpu401.c | 11 ++--------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index b39288675ea6..e14a28557406 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -32,34 +32,29 @@ #include #include -#include +#include +#include #include +#include #include +#include #include -#include -#include -#include +#include +#include #include -#include -#include #include -#include -#include -#include +#include #include -#include -#include -#include -#include #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" #endif #include +#include + #include "mpu_if.h" -#include MALLOC_DEFINE(M_MIDI, "midi buffers", "Midi data allocation area"); #define MIDI_NAMELEN 16 diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c index af3149ec8180..7d3edb6323ef 100644 --- a/sys/dev/sound/midi/mpu401.c +++ b/sys/dev/sound/midi/mpu401.c @@ -27,17 +27,10 @@ */ #include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include #include -#include -#include /* to get driver_intr_t */ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h"