The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8eb778803a8bffd0faa507ae2662725363cae5
commit 4e8eb778803a8bffd0faa507ae2662725363cae5 Author: Christos Margiolis <[email protected]> AuthorDate: 2025-11-21 16:14:18 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2025-11-21 16:14:41 +0000 sound: Clean up midi/ includes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53841 --- 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 <sys/param.h> #include <sys/systm.h> -#include <sys/queue.h> +#include <sys/conf.h> +#include <sys/fcntl.h> #include <sys/kernel.h> +#include <sys/kobj.h> #include <sys/lock.h> +#include <sys/module.h> #include <sys/mutex.h> -#include <sys/proc.h> -#include <sys/signalvar.h> -#include <sys/conf.h> +#include <sys/poll.h> +#include <sys/queue.h> #include <sys/selinfo.h> -#include <sys/sysctl.h> -#include <sys/malloc.h> #include <sys/sx.h> -#include <sys/proc.h> -#include <sys/fcntl.h> -#include <sys/types.h> +#include <sys/sysctl.h> #include <sys/uio.h> -#include <sys/poll.h> -#include <sys/sbuf.h> -#include <sys/kobj.h> -#include <sys/module.h> #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h" #endif #include <dev/sound/midi/midi.h> +#include <dev/sound/midi/midiq.h> + #include "mpu_if.h" -#include <dev/sound/midi/midiq.h> 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 <sys/param.h> -#include <sys/types.h> -#include <sys/param.h> -#include <sys/queue.h> -#include <sys/kernel.h> -#include <sys/lock.h> -#include <sys/mutex.h> -#include <sys/proc.h> #include <sys/systm.h> +#include <sys/bus.h> +#include <sys/kernel.h> #include <sys/kobj.h> -#include <sys/malloc.h> -#include <sys/bus.h> /* to get driver_intr_t */ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_snd.h"
