diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-05-24 06:02:59 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-05-24 06:02:59 +0000 |
| commit | 48030f5214806f67ab1ca8e458d6db2d710fb8f7 (patch) | |
| tree | 39bb9a71a8b65a67eebc467257da0ff49d4d02bc /sys/dev | |
| parent | 5722c9ff9739e866a4937ee9a2dd5a8600ee53cf (diff) | |
remove unneeded includes; ok miod@
Diffstat (limited to 'sys/dev')
153 files changed, 152 insertions, 652 deletions
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index fe2a6dfaf1a..5e662481dcf 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.28 2023/09/11 08:40:25 mvs Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.29 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -41,11 +41,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/queue.h> #include <sys/rwlock.h> -#include <sys/endian.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index b870cc1d11c..c23509e543b 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv_pci.c,v 1.15 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: adv_pci.c,v 1.16 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */ /* @@ -57,8 +57,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/queue.h> #include <sys/device.h> diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 995e71ec8d3..134115258cd 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: adw_pci.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ /* @@ -43,11 +43,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/queue.h> #include <sys/device.h> -#include <sys/timeout.h> #include <machine/bus.h> diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c index a0bab2839b4..8c6cce7c88b 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp.c,v 1.50 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2000 Doug Rabson * All rights reserved. @@ -34,12 +34,6 @@ #include <uvm/uvm_extern.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> - -#include <dev/ic/mc6845reg.h> -#include <dev/ic/pcdisplayvar.h> -#include <dev/ic/vgareg.h> -#include <dev/ic/vgavar.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c index 308299f660d..1b3fc0df114 100644 --- a/sys/dev/pci/agp_ali.c +++ b/sys/dev/pci/agp_ali.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_ali.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp_ali.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: agp_ali.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ @@ -31,15 +31,12 @@ */ #include <sys/param.h> -#include <sys/malloc.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/vga_pcivar.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c index a57e8efec81..c54987e932d 100644 --- a/sys/dev/pci/agp_amd.c +++ b/sys/dev/pci/agp_amd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_amd.c,v 1.23 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp_amd.c,v 1.24 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $ */ /*- @@ -33,11 +33,9 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> -#include <dev/pci/vga_pcivar.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c index e9b5f81f492..7743fb0fa87 100644 --- a/sys/dev/pci/agp_apple.c +++ b/sys/dev/pci/agp_apple.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_apple.c,v 1.8 2016/05/07 22:46:54 kettenis Exp $ */ +/* $OpenBSD: agp_apple.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2012 Martin Pieuchot <mpi@openbsd.org> @@ -18,9 +18,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index c8f9ec793f3..07f24900008 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.96 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.97 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -36,7 +36,6 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c index 628b122187e..a932fd212ee 100644 --- a/sys/dev/pci/agp_intel.c +++ b/sys/dev/pci/agp_intel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_intel.c,v 1.25 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp_intel.c,v 1.26 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -31,9 +31,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c index f0d59d05494..06b93abf129 100644 --- a/sys/dev/pci/agp_sis.c +++ b/sys/dev/pci/agp_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_sis.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp_sis.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: agp_sis.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -31,14 +31,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/vga_pcivar.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c index 75828c10a6c..8b8064bb9ce 100644 --- a/sys/dev/pci/agp_via.c +++ b/sys/dev/pci/agp_via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_via.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: agp_via.c,v 1.23 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */ /*- @@ -31,14 +31,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/vga_pcivar.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 373e87e89f4..a5cbe718e29 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.63 2022/10/21 17:45:40 kn Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.64 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: ahc_pci.c,v 1.43 2003/08/18 09:16:22 taca Exp $ */ /* @@ -42,7 +42,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.63 2022/10/21 17:45:40 kn Exp $ + * $Id: ahc_pci.c,v 1.64 2024/05/24 06:02:53 jsg Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -55,10 +55,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/queue.h> #include <sys/device.h> -#include <sys/reboot.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/ahci_pci.c b/sys/dev/pci/ahci_pci.c index 77da17ccb8f..183df336aaa 100644 --- a/sys/dev/pci/ahci_pci.c +++ b/sys/dev/pci/ahci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci_pci.c,v 1.16 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: ahci_pci.c,v 1.17 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -20,14 +20,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/timeout.h> #include <sys/queue.h> #include <sys/mutex.h> -#include <sys/pool.h> #include <machine/bus.h> @@ -35,8 +30,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/ata/pmreg.h> - #include <dev/ic/ahcireg.h> #include <dev/ic/ahcivar.h> diff --git a/sys/dev/pci/alipm.c b/sys/dev/pci/alipm.c index 228d5fb9216..5d4ad4d0e2c 100644 --- a/sys/dev/pci/alipm.c +++ b/sys/dev/pci/alipm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alipm.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: alipm.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/systm.h> diff --git a/sys/dev/pci/amdiic.c b/sys/dev/pci/amdiic.c index 1bee1fb6c73..5125779f24c 100644 --- a/sys/dev/pci/amdiic.c +++ b/sys/dev/pci/amdiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdiic.c,v 1.13 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: amdiic.c,v 1.14 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index dc9202f7a73..8f96ce7b6d7 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpm.c,v 1.39 2023/02/04 19:19:37 cheloha Exp $ */ +/* $OpenBSD: amdpm.c,v 1.40 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -48,7 +48,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/timeout.h> #include <sys/timetc.h> diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 07fc567f1eb..9c3b5a00aa3 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami_pci.c,v 1.45 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.46 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -28,8 +28,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <sys/rwlock.h> diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index 718831fc5e7..c0ba8a18dc4 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.125 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: arc.c,v 1.126 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -23,8 +23,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/device.h> diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c index cd3cb8fa116..467d5e4e14a 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auacer.c,v 1.29 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: auacer.c,v 1.30 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index e9f2216558a..8d46f8567b6 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.52 2023/09/11 08:41:26 mvs Exp $ */ +/* $OpenBSD: auixp.c,v 1.53 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -48,8 +48,6 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> -#include <sys/exec.h> #include <sys/audioio.h> #include <sys/queue.h> diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 391397e714d..d8a5774b601 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.50 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: autri.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/device.h> @@ -51,7 +50,6 @@ #include <dev/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97.h> -#include <dev/ic/mpuvar.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c index bf9c3377ca0..585b5aff785 100644 --- a/sys/dev/pci/berkwdt.c +++ b/sys/dev/pci/berkwdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: berkwdt.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: berkwdt.c,v 1.12 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <machine/bus.h> diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c index d17f9888360..d1539f09c56 100644 --- a/sys/dev/pci/cac_pci.c +++ b/sys/dev/pci/cac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cac_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: cac_pci.c,v 1.19 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $ */ /*- @@ -36,10 +36,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/queue.h> -#include <sys/endian.h> #include <sys/sensors.h> #include <machine/bus.h> diff --git a/sys/dev/pci/ccp_pci.c b/sys/dev/pci/ccp_pci.c index 18407281d6c..9ad536e0a44 100644 --- a/sys/dev/pci/ccp_pci.c +++ b/sys/dev/pci/ccp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccp_pci.c,v 1.8 2023/11/24 08:47:35 jmatthew Exp $ */ +/* $OpenBSD: ccp_pci.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2018 David Gwynne <dlg@openbsd.org> @@ -18,11 +18,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/rwlock.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/queue.h> #include <machine/bus.h> diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c index 004aface7d8..6a7bf1344d7 100644 --- a/sys/dev/pci/ciss_pci.c +++ b/sys/dev/pci/ciss_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss_pci.c,v 1.22 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: ciss_pci.c,v 1.23 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -19,8 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index fcd23270867..64181b3787b 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.53 2023/03/08 04:43:08 guenther Exp $ */ +/* $OpenBSD: cmpci.c,v 1.54 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */ /* @@ -51,7 +51,6 @@ int cmpcidebug = 0; #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> @@ -60,7 +59,6 @@ int cmpcidebug = 0; #include <sys/audioio.h> #include <dev/audio_if.h> -#include <dev/midi_if.h> #include <dev/pci/cmpcireg.h> #include <dev/pci/cmpcivar.h> diff --git a/sys/dev/pci/com_pci.c b/sys/dev/pci/com_pci.c index 745b7ccdef1..e0cd1ed4d14 100644 --- a/sys/dev/pci/com_pci.c +++ b/sys/dev/pci/com_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pci.c,v 1.3 2023/09/11 08:41:26 mvs Exp $ */ +/* $OpenBSD: com_pci.c,v 1.4 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se> * @@ -17,7 +17,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <dev/pci/pcidevs.h> @@ -26,7 +25,6 @@ #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> -#include <dev/ic/ns16550reg.h> #define com_usr 31 /* Synopsys DesignWare UART */ diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 837a15f6589..4e7dba08c7d 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.60 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: cs4280.c,v 1.61 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -67,8 +67,6 @@ int cs4280debug = 0; #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 93c96caa8e9..7404774520c 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.45 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: cs4281.c,v 1.46 2024/05/24 06:02:53 jsg Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -43,9 +43,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/fcntl.h> #include <sys/device.h> #include <dev/pci/pcidevs.h> @@ -54,7 +52,6 @@ #include <sys/audioio.h> #include <dev/audio_if.h> -#include <dev/midi_if.h> #include <dev/ic/ac97.h> diff --git a/sys/dev/pci/cy82c693.c b/sys/dev/pci/cy82c693.c index f7baa449a65..aaa6d19b184 100644 --- a/sys/dev/pci/cy82c693.c +++ b/sys/dev/pci/cy82c693.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy82c693.c,v 1.8 2015/03/14 03:38:48 jsg Exp $ */ +/* $OpenBSD: cy82c693.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: cy82c693.c,v 1.1 2000/06/06 03:07:39 thorpej Exp $ */ /*- @@ -41,8 +41,6 @@ #include <machine/bus.h> -#include <dev/pci/pcivar.h> - #include <dev/pci/cy82c693reg.h> #include <dev/pci/cy82c693var.h> diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index f4d1b97dcd7..afb5d0a676c 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cz.c,v 1.28 2024/05/15 12:57:36 jsg Exp $ */ +/* $OpenBSD: cz.c,v 1.29 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */ /*- @@ -81,8 +81,6 @@ #include <sys/tty.h> #include <sys/conf.h> #include <sys/time.h> -#include <sys/kernel.h> -#include <sys/fcntl.h> #include <sys/syslog.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/dwiic_pci.c b/sys/dev/pci/dwiic_pci.c index 76a39b60c4c..4ef8e8f372c 100644 --- a/sys/dev/pci/dwiic_pci.c +++ b/sys/dev/pci/dwiic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic_pci.c,v 1.26 2024/04/07 01:04:58 jsg Exp $ */ +/* $OpenBSD: dwiic_pci.c,v 1.27 2024/05/24 06:02:53 jsg Exp $ */ /* * Synopsys DesignWare I2C controller * PCI attachment @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index dd7e2c258b5..1668b98df8f 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.64 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: eap.c,v 1.65 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -51,7 +51,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/fcntl.h> #include <sys/device.h> diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index 70ec084a59c..b6e9f1a2e9d 100644 --- a/sys/dev/pci/ehci_pci.c +++ b/sys/dev/pci/ehci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_pci.c,v 1.32 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: ehci_pci.c,v 1.33 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: ehci_pci.c,v 1.15 2004/04/23 21:13:06 itojun Exp $ */ /* @@ -32,7 +32,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/device.h> #include <sys/timeout.h> @@ -46,7 +45,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usb_mem.h> #include <dev/usb/ehcireg.h> #include <dev/usb/ehcivar.h> diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index b230961c8e0..73a8ba505cc 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.87 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: envy.c,v 1.88 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org> * @@ -32,7 +32,6 @@ #include <sys/device.h> #include <sys/audioio.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <dev/audio_if.h> #include <dev/midi_if.h> #include <dev/ic/ac97.h> diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index 603294058b6..3bdf82cfb79 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esa.c,v 1.42 2023/09/11 08:41:26 mvs Exp $ */ +/* $OpenBSD: esa.c,v 1.43 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */ /* @@ -48,8 +48,6 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> -#include <sys/exec.h> #include <sys/audioio.h> #include <machine/bus.h> diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 27dde7265b1..4bcb08c94af 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.54 2023/03/08 04:43:08 guenther Exp $ */ +/* $OpenBSD: eso.c,v 1.55 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> @@ -46,7 +45,6 @@ #include <dev/audio_if.h> #include <dev/midi_if.h> -#include <dev/ic/mpuvar.h> #include <dev/ic/i8237reg.h> #include <dev/pci/esoreg.h> #include <dev/pci/esovar.h> diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 7927f9a47bc..51f22b606d1 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.37 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: fms.c,v 1.38 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/audioio.h> diff --git a/sys/dev/pci/fmsradio.c b/sys/dev/pci/fmsradio.c index 26f34732dd3..fd584b5080b 100644 --- a/sys/dev/pci/fmsradio.c +++ b/sys/dev/pci/fmsradio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fmsradio.c,v 1.8 2022/03/21 19:22:41 miod Exp $ */ +/* $OpenBSD: fmsradio.c,v 1.9 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2002 Vladimir Popov <jumbo@narod.ru> @@ -39,17 +39,11 @@ #include <sys/malloc.h> #include <sys/device.h> #include <sys/errno.h> -#include <sys/ioctl.h> #include <sys/audioio.h> #include <sys/radioio.h> #include <machine/bus.h> -#include <dev/pci/pcireg.h> -#include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> - -#include <dev/audio_if.h> #include <dev/radio_if.h> #include <dev/ic/ac97.h> diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index ac1a6b2329d..5c4d645c050 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -32,10 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/queue.h> -#include <sys/endian.h> #include <machine/bus.h> diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c index d5aaeef3ba4..6cc788be479 100644 --- a/sys/dev/pci/i82365_pci.c +++ b/sys/dev/pci/i82365_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_pci.c,v 1.15 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: i82365_pci.c,v 1.16 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <dev/ic/i82365reg.h> @@ -47,7 +46,6 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/i82365_pcivar.h> -#include <dev/isa/isavar.h> #include <dev/isa/i82365_isavar.h> /* diff --git a/sys/dev/pci/ichiic.c b/sys/dev/pci/ichiic.c index 8477c002479..30ffe226beb 100644 --- a/sys/dev/pci/ichiic.c +++ b/sys/dev/pci/ichiic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichiic.c,v 1.54 2024/03/06 00:11:25 jsg Exp $ */ +/* $OpenBSD: ichiic.c,v 1.55 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_acx_pci.c b/sys/dev/pci/if_acx_pci.c index 57a5ccc24a2..23a5315ab58 100644 --- a/sys/dev/pci/if_acx_pci.c +++ b/sys/dev/pci/if_acx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_pci.c,v 1.10 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_acx_pci.c,v 1.11 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -25,12 +25,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 15e93515a39..51ef8752e24 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.39 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_age.c,v 1.40 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -38,10 +38,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 86bff590e9b..79d809b2381 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_alc.c,v 1.57 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_alc.c,v 1.58 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -37,10 +37,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index 51979420f39..18c713032fd 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.50 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_ale.c,v 1.51 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -39,10 +39,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index 6eeb32f9ca0..796357edd21 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pci.c,v 1.20 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_an_pci.c,v 1.21 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -57,9 +57,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/timeout.h> -#include <sys/socket.h> -#include <sys/tree.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_aq_pci.c b/sys/dev/pci/if_aq_pci.c index 8ac957befa7..44d00621989 100644 --- a/sys/dev/pci/if_aq_pci.c +++ b/sys/dev/pci/if_aq_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aq_pci.c,v 1.27 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_aq_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_aq.c,v 1.27 2021/06/16 00:21:18 riastradh Exp $ */ /* @@ -84,7 +84,6 @@ #include <sys/types.h> #include <sys/device.h> #include <sys/param.h> -#include <sys/kernel.h> #include <sys/sockio.h> #include <sys/systm.h> #include <sys/intrmap.h> diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c index 8944d4d8d90..099d3f11bfc 100644 --- a/sys/dev/pci/if_ath_pci.c +++ b/sys/dev/pci/if_ath_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ath_pci.c,v 1.27 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_ath_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $ */ /*- @@ -39,13 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/lock.h> -#include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/errno.h> #include <sys/device.h> #include <sys/gpio.h> diff --git a/sys/dev/pci/if_athn_pci.c b/sys/dev/pci/if_athn_pci.c index 35db0664942..0cdf486d0a7 100644 --- a/sys/dev/pci/if_athn_pci.c +++ b/sys/dev/pci/if_athn_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_pci.c,v 1.23 2022/07/24 17:22:12 kn Exp $ */ +/* $OpenBSD: if_athn_pci.c,v 1.24 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -23,12 +23,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c index 899c1d5dd19..d355db177b2 100644 --- a/sys/dev/pci/if_atw_pci.c +++ b/sys/dev/pci/if_atw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_pci.c,v 1.19 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_atw_pci.c,v 1.20 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_atw_pci.c,v 1.7 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -39,14 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/device.h> -#include <sys/endian.h> #include <net/if.h> #include <net/if_media.h> @@ -60,8 +53,6 @@ #include <machine/intr.h> #include <dev/ic/atwreg.h> -#include <dev/ic/rf3000reg.h> -#include <dev/ic/si4136reg.h> #include <dev/ic/atwvar.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 68bc288e23e..6f2ee17cb40 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bce.c,v 1.55 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_bce.c,v 1.56 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */ /* @@ -42,10 +42,7 @@ #include <sys/timeout.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> @@ -62,7 +59,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> #include <dev/pci/if_bcereg.h> diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 1eb9acc03c9..dd6492ba9a7 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.404 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: if_bge.c,v 1.405 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -81,10 +81,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <sys/atomic.h> #include <sys/kstat.h> @@ -108,7 +106,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> #include <dev/mii/brgphyreg.h> #include <dev/pci/if_bgereg.h> diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c index 3dadfafca81..f5c757ea2a6 100644 --- a/sys/dev/pci/if_bnxt.c +++ b/sys/dev/pci/if_bnxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnxt.c,v 1.49 2024/05/07 18:35:23 jan Exp $ */ +/* $OpenBSD: if_bnxt.c,v 1.50 2024/05/24 06:02:53 jsg Exp $ */ /*- * Broadcom NetXtreme-C/E network driver. * @@ -50,7 +50,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/stdint.h> @@ -60,7 +59,6 @@ #include <machine/bus.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/if_bwfm_pci.c b/sys/dev/pci/if_bwfm_pci.c index b50c8f75c2e..476f89a38ee 100644 --- a/sys/dev/pci/if_bwfm_pci.c +++ b/sys/dev/pci/if_bwfm_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwfm_pci.c,v 1.75 2022/12/30 14:10:17 kettenis Exp $ */ +/* $OpenBSD: if_bwfm_pci.c,v 1.76 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se> @@ -16,12 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/queue.h> @@ -32,11 +28,7 @@ #include <dev/ofw/openfirm.h> #endif -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index 4f2103da492..8a5fe8e6121 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwi_pci.c,v 1.18 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_bwi_pci.c,v 1.19 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -23,12 +23,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index 09ac37cd980..372ceb9e821 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cas.c,v 1.55 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_cas.c,v 1.56 2024/05/24 06:02:53 jsg Exp $ */ /* * @@ -49,13 +49,9 @@ #include <sys/timeout.h> #include <sys/mbuf.h> #include <sys/syslog.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> -#include <sys/endian.h> #include <sys/atomic.h> #include <net/if.h> diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index 771154ccd20..a0132a3b75d 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.78 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.79 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -34,17 +34,10 @@ * $FreeBSD: src/sys/pci/if_dc.c,v 1.5 2000/01/12 22:24:05 wpaul Exp $ */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/timeout.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <net/if.h> @@ -54,10 +47,6 @@ #include <net/if_media.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index b178a4aeeef..83151d46055 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.142 2023/04/11 00:45:08 jsg Exp $ */ +/* $OpenBSD: if_de.c,v 1.143 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */ /*- @@ -44,11 +44,9 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/errno.h> -#include <sys/malloc.h> #include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/pool.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index caf3a389dd7..e71c604e984 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,14 +31,12 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.376 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_em.c,v 1.377 2024/05/24 06:02:53 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> #include <dev/pci/if_em_soc.h> -#include <netinet/ip6.h> - /********************************************************************* * Driver version *********************************************************************/ diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 54b2e2039df..c87904a1b1a 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,20 +31,14 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.120 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.121 2024/05/24 06:02:53 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> -#include <sys/kstat.h> #include <net/if.h> #include <net/if_media.h> @@ -52,11 +46,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <uvm/uvm_extern.h> - -#include <dev/pci/pcireg.h> -#include <dev/pci/pcivar.h> - #include <dev/pci/if_em.h> #include <dev/pci/if_em_hw.h> #include <dev/pci/if_em_soc.h> diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 93fed4ef8f2..060e9438d2b 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.37 2023/09/11 08:41:26 mvs Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.38 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -31,16 +31,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/timeout.h> -#include <sys/syslog.h> #include <sys/device.h> #include <net/if.h> @@ -49,11 +42,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - -#include <machine/cpu.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c index 048ef120673..7e26ef7963f 100644 --- a/sys/dev/pci/if_epic_pci.c +++ b/sys/dev/pci/if_epic_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_epic_pci.c,v 1.17 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_epic_pci.c,v 1.18 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $ */ /*- @@ -38,12 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 63f5915fcf4..c10ba124c57 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_et.c,v 1.43 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_et.c,v 1.44 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. * @@ -38,15 +38,12 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/endian.h> #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> @@ -63,7 +60,6 @@ #include <dev/mii/miivar.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 6754ba4fc46..4c1687db539 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.67 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.68 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -36,29 +36,19 @@ * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/timeout.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_media.h> #include <netinet/in.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/device.h> #include <netinet/if_ether.h> -#include <machine/cpu.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 9dda743ef0e..f8ebc96c78b 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.40 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.41 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -36,12 +36,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> -#include <sys/errno.h> #include <sys/device.h> -#include <sys/endian.h> #include <net/if.h> #include <net/if_media.h> @@ -57,7 +52,6 @@ #endif #include <dev/mii/miivar.h> -#include <dev/mii/mii_bitbang.h> #include <dev/ic/gemreg.h> #include <dev/ic/gemvar.h> diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 3019ee18cec..9280df44bcd 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.24 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.25 2024/05/24 06:02:53 jsg Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -33,10 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/syslog.h> #include <sys/device.h> -#include <sys/malloc.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> @@ -50,7 +47,6 @@ #include <machine/autoconf.h> #include <dev/ofw/openfirm.h> #endif -#include <machine/cpu.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_iavf.c b/sys/dev/pci/if_iavf.c index eff312b6a70..dc3ef72aecd 100644 --- a/sys/dev/pci/if_iavf.c +++ b/sys/dev/pci/if_iavf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iavf.c,v 1.12 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_iavf.c,v 1.13 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -55,7 +55,6 @@ #include <sys/proc.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/device.h> #include <sys/pool.h> @@ -68,7 +67,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_igc.c b/sys/dev/pci/if_igc.c index c808fd69dca..450f6a5f912 100644 --- a/sys/dev/pci/if_igc.c +++ b/sys/dev/pci/if_igc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_igc.c,v 1.24 2024/05/21 11:19:39 bluhm Exp $ */ +/* $OpenBSD: if_igc.c,v 1.25 2024/05/24 06:02:53 jsg Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause * @@ -37,7 +37,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index d086ade1efc..c4810738070 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.148 2023/03/08 04:43:08 guenther Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.149 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -26,11 +26,9 @@ #include <sys/param.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/socket.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/task.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index f299e477e72..80bb9e7c972 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.415 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.416 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -109,12 +109,8 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/conf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/mutex.h> -#include <sys/proc.h> #include <sys/rwlock.h> #include <sys/socket.h> #include <sys/sockio.h> @@ -134,7 +130,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 6c783e34949..85a0d486874 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.262 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.263 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -26,12 +26,10 @@ #include <sys/param.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/socket.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/task.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index dbe9390de31..b692620777e 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.185 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.186 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -96,12 +96,8 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/conf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/mutex.h> -#include <sys/proc.h> #include <sys/rwlock.h> #include <sys/socket.h> #include <sys/sockio.h> @@ -121,7 +117,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 398b995a040..deacf805b8f 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.100 2024/05/08 17:52:11 jan Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.101 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -55,7 +55,6 @@ #include <sys/proc.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/device.h> #include <sys/pool.h> @@ -69,7 +68,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/route.h> #include <net/toeplitz.h> diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 08c08c8858b..fcbe0bf45d9 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.57 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_jme.c,v 1.58 2024/05/24 06:02:53 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -38,10 +38,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index 4a08513dfc4..543cf3049b9 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.80 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_lge.c,v 1.81 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -80,10 +80,7 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> @@ -102,7 +99,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #define LGE_USEIOSPACE diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index 3d0d2f75a38..81da9ca4bef 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lii.c,v 1.46 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_lii.c,v 1.47 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation. @@ -36,9 +36,7 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> -#include <sys/malloc.h> #include <sys/device.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c index a8cf0124299..47119fb618f 100644 --- a/sys/dev/pci/if_malo_pci.c +++ b/sys/dev/pci/if_malo_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo_pci.c,v 1.11 2022/03/11 18:00:45 mpi Exp $ */ +/* $OpenBSD: if_malo_pci.c,v 1.12 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -23,12 +23,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c index 8005312dcf8..b934e832c51 100644 --- a/sys/dev/pci/if_mcx.c +++ b/sys/dev/pci/if_mcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcx.c,v 1.114 2024/04/12 01:54:21 jsg Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.115 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 2017 David Gwynne <dlg@openbsd.org> @@ -25,11 +25,8 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/device.h> -#include <sys/pool.h> -#include <sys/queue.h> #include <sys/timeout.h> #include <sys/task.h> #include <sys/atomic.h> @@ -40,7 +37,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/toeplitz.h> diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 88d9e3d2ac3..acbcf885673 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.143 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_msk.c,v 1.144 2024/05/24 06:02:53 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -94,8 +94,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/timeout.h> #include <sys/device.h> #include <sys/queue.h> @@ -115,7 +113,6 @@ #include <sys/kstat.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c index 2a2242e52df..cd9eb66b5ca 100644 --- a/sys/dev/pci/if_mtd_pci.c +++ b/sys/dev/pci/if_mtd_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mtd_pci.c,v 1.13 2022/08/29 06:08:04 jsg Exp $ */ +/* $OpenBSD: if_mtd_pci.c,v 1.14 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru> @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/systm.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index b13d445186d..a332467fb5b 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.119 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_myx.c,v 1.120 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -27,14 +27,11 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/malloc.h> #include <sys/pool.h> #include <sys/timeout.h> #include <sys/device.h> -#include <sys/proc.h> -#include <sys/queue.h> #include <sys/rwlock.h> #include <sys/kstat.h> diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c index 5ed6bc7b2f2..8f8f801fa30 100644 --- a/sys/dev/pci/if_ne_pci.c +++ b/sys/dev/pci/if_ne_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pci.c,v 1.21 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_ne_pci.c,v 1.22 2024/05/24 06:02:56 jsg Exp $ */ /* $NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $ */ /*- @@ -31,13 +31,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/syslog.h> -#include <sys/socket.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c index 64c8d6a482a..031672cc3ac 100644 --- a/sys/dev/pci/if_nep.c +++ b/sys/dev/pci/if_nep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nep.c,v 1.34 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_nep.c,v 1.35 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2014, 2015 Mark Kettenis * @@ -36,7 +36,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index ffe34c5e293..56d5b06b9e2 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.125 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.126 2024/05/24 06:02:56 jsg Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -28,10 +28,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_ngbe.c b/sys/dev/pci/if_ngbe.c index 5483380f6b4..769c648b5e1 100644 --- a/sys/dev/pci/if_ngbe.c +++ b/sys/dev/pci/if_ngbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ngbe.c,v 1.4 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_ngbe.c,v 1.5 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2015-2017 Beijing WangXun Technology Co., Ltd. @@ -25,8 +25,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/endian.h> #include <sys/intrmap.h> diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 4971b174624..09148df4674 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.98 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_nge.c,v 1.99 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -95,10 +95,7 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> @@ -117,7 +114,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #define NGE_USEIOSPACE diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c index 30dc8fd8015..8e39c29691b 100644 --- a/sys/dev/pci/if_nxe.c +++ b/sys/dev/pci/if_nxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nxe.c,v 1.80 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_nxe.c,v 1.81 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -22,11 +22,9 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/proc.h> #include <sys/queue.h> #include <sys/timeout.h> #include <sys/sensors.h> @@ -39,7 +37,6 @@ #include <dev/pci/pcidevs.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 1e2710c4a87..04d9bda8529 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.108 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_oce.c,v 1.109 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -62,7 +62,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/queue.h> @@ -75,10 +74,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#ifdef INET6 -#include <netinet/ip6.h> -#endif - #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 28e98b037ff..3d93a269ba9 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pcn.c,v 1.49 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_pcn.c,v 1.50 2024/05/24 06:02:56 jsg Exp $ */ /* $NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $ */ /* @@ -71,9 +71,6 @@ #include <sys/systm.h> #include <sys/timeout.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c index dba3bdb7ed8..c17cb5b149e 100644 --- a/sys/dev/pci/if_pgt_pci.c +++ b/sys/dev/pci/if_pgt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_pci.c,v 1.19 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_pgt_pci.c,v 1.20 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -23,12 +23,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_qwx_pci.c b/sys/dev/pci/if_qwx_pci.c index 6e27e346cb3..7f85a4dd01b 100644 --- a/sys/dev/pci/if_qwx_pci.c +++ b/sys/dev/pci/if_qwx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qwx_pci.c,v 1.15 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_qwx_pci.c,v 1.16 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright 2023 Stefan Sperling <stsp@openbsd.org> @@ -53,14 +53,11 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/lock.h> #include <sys/socket.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c index 8f049f05121..8c752cb8b31 100644 --- a/sys/dev/pci/if_ral_pci.c +++ b/sys/dev/pci/if_ral_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral_pci.c,v 1.28 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_ral_pci.c,v 1.29 2024/05/24 06:02:56 jsg Exp $ */ /*- * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -23,12 +23,7 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index aaf30479bf3..3f9d61d20d0 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_pci.c,v 1.57 2024/01/19 03:46:15 dlg Exp $ */ +/* $OpenBSD: if_re_pci.c,v 1.58 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -21,15 +21,9 @@ */ #include <sys/param.h> -#include <sys/endian.h> #include <sys/systm.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_rge.c b/sys/dev/pci/if_rge.c index 6a487c50f1b..84ed79b3e9d 100644 --- a/sys/dev/pci/if_rge.c +++ b/sys/dev/pci/if_rge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rge.c,v 1.25 2024/05/20 01:51:32 kevlo Exp $ */ +/* $OpenBSD: if_rge.c,v 1.26 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 2019, 2020, 2023 Kevin Lo <kevlo@openbsd.org> @@ -25,8 +25,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index d09daf7c4ed..97d57393247 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.34 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.35 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -32,15 +32,8 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/timeout.h> @@ -51,10 +44,6 @@ #include <net/if_media.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <machine/bus.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index 7f8c1f516f1..453170a7441 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_pci.c,v 1.21 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_rtw_pci.c,v 1.22 2024/05/24 06:02:56 jsg Exp $ */ /* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */ /*- @@ -41,14 +41,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/device.h> -#include <sys/endian.h> #include <net/if.h> #include <net/if_media.h> @@ -62,7 +55,6 @@ #include <machine/intr.h> #include <dev/ic/rtwreg.h> -#include <dev/ic/sa2400reg.h> #include <dev/ic/rtwvar.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c index 121b5a3cd8c..57bd34ebdea 100644 --- a/sys/dev/pci/if_rtwn.c +++ b/sys/dev/pci/if_rtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtwn.c,v 1.41 2023/07/14 14:28:47 kevlo Exp $ */ +/* $OpenBSD: if_rtwn.c,v 1.42 2024/05/24 06:02:56 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -25,14 +25,10 @@ #include "bpfilter.h" #include <sys/param.h> -#include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/systm.h> -#include <sys/task.h> #include <sys/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> @@ -43,7 +39,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c index 7ad0bcc2370..29b01489055 100644 --- a/sys/dev/pci/if_se.c +++ b/sys/dev/pci/if_se.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_se.c,v 1.24 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_se.c,v 1.25 2024/05/24 06:02:56 jsg Exp $ */ /*- * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de> @@ -57,10 +57,7 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/kernel.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <sys/sockio.h> #include <sys/timeout.h> #include <net/if.h> diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c index cf58df25657..2f79d2b3723 100644 --- a/sys/dev/pci/if_sf_pci.c +++ b/sys/dev/pci/if_sf_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf_pci.c,v 1.15 2022/03/11 18:00:48 mpi Exp $ */ +/* $OpenBSD: if_sf_pci.c,v 1.16 2024/05/24 06:02:56 jsg Exp $ */ /* $NetBSD: if_sf_pci.c,v 1.10 2006/06/17 23:34:27 christos Exp $ */ /*- @@ -37,12 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> #include <sys/device.h> #include <net/if.h> diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 22d3a2056a5..696eb62a4f4 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.144 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_sis.c,v 1.145 2024/05/24 06:02:56 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -63,11 +63,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <sys/socket.h> #include <sys/ioctl.h> #include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <net/if.h> diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index dd8a69085f7..e9997ac70a8 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.195 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_sk.c,v 1.196 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -93,8 +93,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/timeout.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index fbbb82593f3..06b1362cdc8 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.70 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_ste.c,v 1.71 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -42,7 +42,6 @@ #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <net/if.h> @@ -60,7 +59,6 @@ #include <sys/device.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index 773bdd85c0c..26845c489a1 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_stge.c,v 1.73 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_stge.c,v 1.74 2024/05/24 06:02:57 jsg Exp $ */ /* $NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $ */ /*- @@ -42,9 +42,6 @@ #include <sys/systm.h> #include <sys/timeout.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c index 57e114057ba..17f51a5a4b3 100644 --- a/sys/dev/pci/if_tht.c +++ b/sys/dev/pci/if_tht.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tht.c,v 1.147 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_tht.c,v 1.148 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -30,11 +30,9 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/timeout.h> #include <sys/queue.h> #include <sys/rwlock.h> #include <sys/time.h> diff --git a/sys/dev/pci/if_ti_pci.c b/sys/dev/pci/if_ti_pci.c index 05f6aa9b7fc..13ba401a1e8 100644 --- a/sys/dev/pci/if_ti_pci.c +++ b/sys/dev/pci/if_ti_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti_pci.c,v 1.7 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: if_ti_pci.c,v 1.8 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -73,7 +73,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/socket.h> #include <sys/systm.h> #include <net/if.h> diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 895550ca3b7..b21fb602745 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.78 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_tl.c,v 1.79 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -186,9 +186,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index a1fdd7e6960..2d17a344317 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.130 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_txp.c,v 1.131 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2001 @@ -39,7 +39,6 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/device.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index f4d5cf204c0..e7483677831 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vge.c,v 1.77 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_vge.c,v 1.78 2024/05/24 06:02:57 jsg Exp $ */ /* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -89,11 +89,8 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c index 68198af6daa..3258dd26262 100644 --- a/sys/dev/pci/if_vic.c +++ b/sys/dev/pci/if_vic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vic.c,v 1.105 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_vic.c,v 1.106 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org> @@ -27,7 +27,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/socket.h> #include <sys/malloc.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 79e752901ca..a2e8bfb2a6e 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.160 2023/12/05 13:43:39 kevlo Exp $ */ +/* $OpenBSD: if_vr.c,v 1.161 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -68,9 +68,7 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <net/if.h> #include <sys/device.h> diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 73c255598f2..6493bd653a0 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vte.c,v 1.27 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_vte.c,v 1.28 2024/05/24 06:02:57 jsg Exp $ */ /*- * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -36,10 +36,8 @@ #include <sys/sockio.h> #include <sys/mbuf.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> #include <machine/bus.h> @@ -54,10 +52,8 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index 3fbb0f927f4..d7ff8f36a78 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.76 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: if_wb.c,v 1.77 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -91,9 +91,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/queue.h> #include <sys/timeout.h> @@ -112,7 +109,6 @@ #include <uvm/uvm_extern.h> /* for vtophys */ #define VTOPHYS(v) vtophys((vaddr_t)(v)) -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 85f9f91a858..84dfca0de9e 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.56 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.57 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2001-2003 Todd C. Miller <millert@openbsd.org> @@ -44,8 +44,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/timeout.h> -#include <sys/socket.h> -#include <sys/tree.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 30dcc8a1a29..2ae55716813 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.157 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.158 2024/05/24 06:02:57 jsg Exp $ */ /*- * Copyright (c) 2006-2008 @@ -26,12 +26,9 @@ #include <sys/param.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/rwlock.h> -#include <sys/socket.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/task.h> #include <sys/endian.h> diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c index 67c4f4ac44b..dd327ba4d12 100644 --- a/sys/dev/pci/if_xge.c +++ b/sys/dev/pci/if_xge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xge.c,v 1.83 2023/11/10 15:51:24 bluhm Exp $ */ +/* $OpenBSD: if_xge.c,v 1.84 2024/05/24 06:02:57 jsg Exp $ */ /* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */ /* @@ -46,9 +46,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <sys/endian.h> @@ -69,8 +66,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <sys/lock.h> - #include <dev/pci/if_xgereg.h> /* Xframe chipset revisions */ diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index 963e1984c34..4a29dacd6d3 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.48 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.49 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -34,16 +34,8 @@ * $FreeBSD: if_xl.c,v 1.72 2000/01/09 21:12:59 wpaul Exp $ */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/errno.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <net/if.h> @@ -57,10 +49,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - /* * The following #define causes the code to use PIO to access the * chip's registers instead of memory mapped mode. The reason PIO mode diff --git a/sys/dev/pci/igc_base.c b/sys/dev/pci/igc_base.c index fc441e942f9..10286b87ee7 100644 --- a/sys/dev/pci/igc_base.c +++ b/sys/dev/pci/igc_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igc_base.c,v 1.1 2021/10/31 14:52:57 patrick Exp $ */ +/* $OpenBSD: igc_base.c,v 1.2 2024/05/24 06:02:57 jsg Exp $ */ /*- * Copyright 2021 Intel Corp * Copyright 2021 Rubicon Communications, LLC (Netgate) @@ -6,7 +6,6 @@ */ #include <dev/pci/igc_hw.h> -#include <dev/pci/igc_i225.h> #include <dev/pci/if_igc.h> #include <dev/pci/igc_mac.h> #include <dev/pci/igc_base.h> diff --git a/sys/dev/pci/iosf_pci.c b/sys/dev/pci/iosf_pci.c index 886a39c6071..bb6feb19c23 100644 --- a/sys/dev/pci/iosf_pci.c +++ b/sys/dev/pci/iosf_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iosf_pci.c,v 1.1 2023/04/23 00:20:26 dlg Exp $ */ +/* $OpenBSD: iosf_pci.c,v 1.2 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2023 David Gwynne <dlg@openbsd.org> @@ -19,8 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/mutex.h> -#include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index afbd0e1849f..e255d3d8666 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.135 2022/04/16 19:19:59 naddy Exp $ */ +/* $OpenBSD: ips.c,v 1.136 2024/05/24 06:02:57 jsg Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -26,7 +26,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/ioctl.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/sensors.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/ixgb_ee.c b/sys/dev/pci/ixgb_ee.c index cde1ec402fd..a0c5bbbd18e 100644 --- a/sys/dev/pci/ixgb_ee.c +++ b/sys/dev/pci/ixgb_ee.c @@ -31,16 +31,11 @@ *******************************************************************************/ -/* $OpenBSD: ixgb_ee.c,v 1.8 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: ixgb_ee.c,v 1.9 2024/05/24 06:02:57 jsg Exp $ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c index 2f9a5ca9b6f..78760e73624 100644 --- a/sys/dev/pci/ixgb_hw.c +++ b/sys/dev/pci/ixgb_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: ixgb_hw.c,v 1.10 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: ixgb_hw.c,v 1.11 2024/05/24 06:02:58 jsg Exp $ */ /* ixgb_hw.c * Shared functions for accessing and configuring the adapter @@ -39,12 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/sockio.h> -#include <sys/mbuf.h> -#include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> diff --git a/sys/dev/pci/jmb.c b/sys/dev/pci/jmb.c index b75f9250c13..bce06974d0c 100644 --- a/sys/dev/pci/jmb.c +++ b/sys/dev/pci/jmb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jmb.c,v 1.10 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: jmb.c,v 1.11 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -18,11 +18,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/queue.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index f75e75ded5e..3ed4a4c4465 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.51 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: maestro.c,v 1.52 2024/05/24 06:02:58 jsg Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -48,7 +48,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/pci/mbg.c b/sys/dev/pci/mbg.c index b525cc9eff4..47e38609e1c 100644 --- a/sys/dev/pci/mbg.c +++ b/sys/dev/pci/mbg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mbg.c,v 1.36 2024/03/23 10:38:02 sthen Exp $ */ +/* $OpenBSD: mbg.c,v 1.37 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2006, 2007 Marc Balmer <mbalmer@openbsd.org> @@ -18,11 +18,9 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/timeout.h> #include <sys/systm.h> #include <sys/sensors.h> -#include <sys/syslog.h> #include <sys/time.h> #include <machine/bus.h> diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c index 18ea6f5e77b..b5e2f2813c1 100644 --- a/sys/dev/pci/mfi_pci.c +++ b/sys/dev/pci/mfi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi_pci.c,v 1.31 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: mfi_pci.c,v 1.32 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -15,12 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bio.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <sys/rwlock.h> #include <sys/sensors.h> diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index a12c33f6732..cd527f1728f 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfii.c,v 1.90 2024/02/05 19:08:29 deraadt Exp $ */ +/* $OpenBSD: mfii.c,v 1.91 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@openbsd.org> @@ -28,7 +28,6 @@ #include <sys/atomic.h> #include <sys/sensors.h> #include <sys/rwlock.h> -#include <sys/syslog.h> #include <sys/smr.h> #include <dev/biovar.h> diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c index 26db845681d..88c21d49585 100644 --- a/sys/dev/pci/mmuagp.c +++ b/sys/dev/pci/mmuagp.c @@ -26,9 +26,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/rwlock.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/mpi_pci.c b/sys/dev/pci/mpi_pci.c index b44a46e7537..7161823a517 100644 --- a/sys/dev/pci/mpi_pci.c +++ b/sys/dev/pci/mpi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi_pci.c,v 1.26 2022/03/11 18:00:50 mpi Exp $ */ +/* $OpenBSD: mpi_pci.c,v 1.27 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -17,12 +17,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bio.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <sys/sensors.h> #include <sys/rwlock.h> diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 36a74fc5f2a..8b9d8418a7d 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.147 2023/11/29 06:54:09 jmatthew Exp $ */ +/* $OpenBSD: mpii.c,v 1.148 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov * Copyright (c) 2009 James Giannoules @@ -23,13 +23,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/rwlock.h> #include <sys/sensors.h> #include <sys/dkio.h> -#include <sys/tree.h> #include <sys/task.h> #include <machine/bus.h> diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index fe77bc96d05..e249d22b958 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.41 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: neo.c,v 1.42 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -34,8 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/nvme_pci.c b/sys/dev/pci/nvme_pci.c index 3dfdf955a3c..5e0ba65cb6b 100644 --- a/sys/dev/pci/nvme_pci.c +++ b/sys/dev/pci/nvme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme_pci.c,v 1.10 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: nvme_pci.c,v 1.11 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -18,14 +18,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/timeout.h> #include <sys/queue.h> #include <sys/mutex.h> -#include <sys/pool.h> #include <machine/bus.h> diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index d132b45ae78..9f076e1edcf 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_pci.c,v 1.42 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: ohci_pci.c,v 1.43 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> #include <sys/queue.h> @@ -52,7 +51,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usb_mem.h> #include <dev/usb/ohcireg.h> #include <dev/usb/ohcivar.h> diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 8d20757e607..926a8e948ac 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.104 2024/05/13 01:15:51 jsg Exp $ */ +/* $OpenBSD: pccbb.c,v 1.105 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */ /* @@ -40,10 +40,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/evcount.h> -#include <sys/ioctl.h> -#include <sys/syslog.h> #include <sys/device.h> #include <sys/malloc.h> #include <sys/task.h> diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index f1e862802ae..9ea82c5f032 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.21 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: pcscp.c,v 1.22 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: pcscp.c,v 1.26 2003/10/19 10:25:42 tsutsui Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/buf.h> #include <machine/bus.h> diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c index fa58f748c41..1723149e902 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: piixpm.c,v 1.43 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: piixpm.c,v 1.44 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c index 12e30bbf36e..3116f0847b8 100644 --- a/sys/dev/pci/pwdog.c +++ b/sys/dev/pci/pwdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwdog.c,v 1.12 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: pwdog.c,v 1.13 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <machine/bus.h> diff --git a/sys/dev/pci/qla_pci.c b/sys/dev/pci/qla_pci.c index 4102f6c97c3..94aa95b8da8 100644 --- a/sys/dev/pci/qla_pci.c +++ b/sys/dev/pci/qla_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla_pci.c,v 1.9 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: qla_pci.c,v 1.10 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -17,15 +17,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bio.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/sensors.h> -#include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index ced20f8948d..152154ce23a 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.64 2024/04/14 00:38:26 jsg Exp $ */ +/* $OpenBSD: qle.c,v 1.65 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -16,15 +16,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bio.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/atomic.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/sensors.h> -#include <sys/rwlock.h> #include <sys/task.h> #include <sys/timeout.h> @@ -34,10 +30,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#ifdef __sparc64__ -#include <dev/ofw/openfirm.h> -#endif - #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/pci/qlw_pci.c b/sys/dev/pci/qlw_pci.c index e1e4c5564f4..9ed90d8343d 100644 --- a/sys/dev/pci/qlw_pci.c +++ b/sys/dev/pci/qlw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw_pci.c,v 1.12 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: qlw_pci.c,v 1.13 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -18,15 +18,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "bio.h" - #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> -#include <sys/sensors.h> -#include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/sili_pci.c b/sys/dev/pci/sili_pci.c index ac4eb61b89f..a33c54874dc 100644 --- a/sys/dev/pci/sili_pci.c +++ b/sys/dev/pci/sili_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sili_pci.c,v 1.15 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: sili_pci.c,v 1.16 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -18,8 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c index e3bae243be2..31f0f833d6b 100644 --- a/sys/dev/pci/siop_pci.c +++ b/sys/dev/pci/siop_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci.c,v 1.8 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: siop_pci.c,v 1.9 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: siop_pci.c,v 1.18 2005/06/28 00:28:42 thorpej Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c index bd5c8a621de..70092ddbb3e 100644 --- a/sys/dev/pci/siop_pci_common.c +++ b/sys/dev/pci/siop_pci_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci_common.c,v 1.19 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: siop_pci_common.c,v 1.20 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: siop_pci_common.c,v 1.25 2005/06/28 00:28:42 thorpej Exp $ */ /* @@ -30,10 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> -#include <sys/buf.h> -#include <sys/kernel.h> -#include <sys/endian.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 841738c45be..2e60aabe53a 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.43 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: sv.c,v 1.44 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/pci/twe_pci.c b/sys/dev/pci/twe_pci.c index 01f3f021944..f15b295df6e 100644 --- a/sys/dev/pci/twe_pci.c +++ b/sys/dev/pci/twe_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe_pci.c,v 1.15 2022/03/11 18:00:52 mpi Exp $ */ +/* $OpenBSD: twe_pci.c,v 1.16 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -28,8 +28,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/device.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 1142f302255..9a41df49ec8 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_pci.c,v 1.35 2022/03/11 18:00:52 mpi Exp $ */ +/* $OpenBSD: uhci_pci.c,v 1.36 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: uhci_pci.c,v 1.24 2002/10/02 16:51:58 thorpej Exp $ */ /* @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/timeout.h> #include <sys/queue.h> @@ -45,7 +44,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usb_mem.h> #include <dev/usb/uhcireg.h> #include <dev/usb/uhcivar.h> diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 1e55723a5ab..88ddbd1ae6a 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.90 2022/03/11 18:00:52 mpi Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.91 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -69,10 +69,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/malloc.h> -#include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/vga_pci_common.c b/sys/dev/pci/vga_pci_common.c index 094846a906d..ef3f043380f 100644 --- a/sys/dev/pci/vga_pci_common.c +++ b/sys/dev/pci/vga_pci_common.c @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <machine/bus.h> diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c index 2fc8f92cf55..e93b0539935 100644 --- a/sys/dev/pci/viapm.c +++ b/sys/dev/pci/viapm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viapm.c,v 1.22 2023/02/04 19:19:37 cheloha Exp $ */ +/* $OpenBSD: viapm.c,v 1.23 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org> @@ -60,7 +60,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/sensors.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c index 7a6efd294e3..5b37a807e15 100644 --- a/sys/dev/pci/vmwpvs.c +++ b/sys/dev/pci/vmwpvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmwpvs.c,v 1.27 2022/04/16 19:19:59 naddy Exp $ */ +/* $OpenBSD: vmwpvs.c,v 1.28 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -19,11 +19,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/rwlock.h> -#include <sys/dkio.h> #include <sys/task.h> #include <machine/bus.h> diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c index c785979fcce..af2e61771bb 100644 --- a/sys/dev/pci/wdt.c +++ b/sys/dev/pci/wdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdt.c,v 1.26 2022/03/11 18:00:52 mpi Exp $ */ +/* $OpenBSD: wdt.c,v 1.27 2024/05/24 06:02:58 jsg Exp $ */ /*- * Copyright (c) 1998,1999 Alex Nash @@ -29,7 +29,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <machine/bus.h> diff --git a/sys/dev/pci/xhci_pci.c b/sys/dev/pci/xhci_pci.c index ca1a0b3431b..5409588f39c 100644 --- a/sys/dev/pci/xhci_pci.c +++ b/sys/dev/pci/xhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xhci_pci.c,v 1.12 2023/04/18 21:22:00 patrick Exp $ */ +/* $OpenBSD: xhci_pci.c,v 1.13 2024/05/24 06:02:58 jsg Exp $ */ /* * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -31,11 +31,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/device.h> -#include <sys/timeout.h> -#include <sys/queue.h> #include <machine/bus.h> @@ -45,7 +42,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usb_mem.h> #include <dev/usb/xhcireg.h> #include <dev/usb/xhcivar.h> diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 666f3b465ef..888492d2b4e 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.63 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: yds.c,v 1.64 2024/05/24 06:02:58 jsg Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -41,11 +41,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/queue.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcireg.h> @@ -53,7 +50,6 @@ #include <sys/audioio.h> #include <dev/audio_if.h> -#include <dev/midi_if.h> #include <dev/ic/ac97.h> #include <machine/bus.h> |