diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-05-23 03:21:10 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-05-23 03:21:10 +0000 |
| commit | a5be2eac734732163bed30ce440b850702881d40 (patch) | |
| tree | 81be12c0bc325fdebf17a20e1c0c81354fc290fe | |
| parent | 06ad7bcbd397518bfe4f93d4cbc6759473f204fa (diff) | |
remove unneeded includes; ok mpi@
99 files changed, 99 insertions, 405 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index db59abf9919..95b28784b6e 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.219 2022/04/12 19:41:11 naddy Exp $ */ +/* $OpenBSD: ehci.c,v 1.220 2024/05/23 03:21:08 jsg Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -57,7 +57,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/usb/fido.c b/sys/dev/usb/fido.c index edec714d3cf..af9cef6bf3e 100644 --- a/sys/dev/usb/fido.c +++ b/sys/dev/usb/fido.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fido.c,v 1.5 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: fido.c,v 1.6 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2019 Reyk Floeter <reyk@openbsd.org> @@ -20,22 +20,15 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/signalvar.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/conf.h> #include <sys/tty.h> -#include <sys/proc.h> -#include <sys/vnode.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/uhidev.h> #include <dev/usb/uhid.h> diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index 49d5c06cf2d..b0e00117202 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.65 2022/07/10 21:13:41 bluhm Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.66 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -26,11 +26,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> @@ -58,7 +55,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/if_athn_usb.h> diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 5e460b9b3af..ae09cb80d61 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.134 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_atu.c,v 1.135 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -50,10 +50,7 @@ #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/timeout.h> #include <sys/queue.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index b77a11ec5ce..08d40515e1a 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.112 2021/08/09 07:21:48 jmatthew Exp $ */ +/* $OpenBSD: if_aue.c,v 1.113 2024/05/23 03:21:08 jsg Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -84,8 +84,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index c58406b7dfe..4ee709ba493 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.142 2020/07/31 10:49:32 mglocker Exp $ */ +/* $OpenBSD: if_axe.c,v 1.143 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -94,8 +94,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c index f60af2a7ccd..cb384fa8352 100644 --- a/sys/dev/usb/if_axen.c +++ b/sys/dev/usb/if_axen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axen.c,v 1.32 2024/01/04 08:41:59 kevlo Exp $ */ +/* $OpenBSD: if_axen.c,v 1.33 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org> @@ -28,8 +28,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_bwfm_usb.c b/sys/dev/usb/if_bwfm_usb.c index d627d937268..bfd701bc609 100644 --- a/sys/dev/usb/if_bwfm_usb.c +++ b/sys/dev/usb/if_bwfm_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwfm_usb.c,v 1.20 2021/11/05 11:38:51 mpi Exp $ */ +/* $OpenBSD: if_bwfm_usb.c,v 1.21 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se> @@ -16,22 +16,13 @@ * 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> -#include <sys/socket.h> -#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> @@ -43,7 +34,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdivar.h> #include <dev/usb/usb_mem.h> #include <dev/usb/usbdevs.h> diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index faa5ba5d53d..c90a7d344fc 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.82 2024/01/04 08:41:59 kevlo Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.83 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -46,8 +46,6 @@ #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 <net/if.h> diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 5618414022b..c4e4cfcea53 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.80 2020/07/31 10:49:32 mglocker Exp $ */ +/* $OpenBSD: if_cue.c,v 1.81 2024/05/23 03:21:08 jsg Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -62,8 +62,6 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/timeout.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 5b09c42a6d2..facadffb544 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.92 2020/07/31 10:49:32 mglocker Exp $ */ +/* $OpenBSD: if_kue.c,v 1.93 2024/05/23 03:21:08 jsg Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -77,8 +77,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 <net/if.h> diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index f7cf57fe39f..16d45bb1107 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.43 2020/07/31 10:49:32 mglocker Exp $ */ +/* $OpenBSD: if_mos.c,v 1.44 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -77,8 +77,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> @@ -99,7 +97,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdivar.h> #include <dev/usb/usbdevs.h> #include <dev/usb/if_mosreg.h> diff --git a/sys/dev/usb/if_mtw.c b/sys/dev/usb/if_mtw.c index 510866080d2..bdc53a36661 100644 --- a/sys/dev/usb/if_mtw.c +++ b/sys/dev/usb/if_mtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mtw.c,v 1.10 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: if_mtw.c,v 1.11 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2013-2014 Kevin Lo @@ -26,11 +26,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_mue.c b/sys/dev/usb/if_mue.c index 331d30f7bf2..e8fc59ce5e9 100644 --- a/sys/dev/usb/if_mue.c +++ b/sys/dev/usb/if_mue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mue.c,v 1.11 2021/07/25 06:43:04 mglocker Exp $ */ +/* $OpenBSD: if_mue.c,v 1.12 2024/05/23 03:21:08 jsg Exp $ */ /* * Copyright (c) 2018 Kevin Lo <kevlo@openbsd.org> @@ -25,8 +25,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 7f38503b964..ae07f5cc7a8 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.72 2023/03/08 04:43:08 guenther Exp $ */ +/* $OpenBSD: if_otus.c,v 1.73 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -25,11 +25,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index b6884645d43..e5c7483dd7a 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.149 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_ral.c,v 1.150 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -27,11 +27,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> @@ -53,7 +50,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/if_ralreg.h> diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 834fdee0bb7..f415dbcaa18 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.52 2023/03/08 04:43:08 guenther Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.53 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -25,11 +25,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index fe08e053bca..cb4cf33884c 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.128 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: if_rum.c,v 1.129 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -27,11 +27,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> @@ -53,7 +50,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/if_rumreg.h> diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 436dd3267ce..f90e811ef75 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.139 2024/04/14 03:26:25 jsg Exp $ */ +/* $OpenBSD: if_run.c,v 1.140 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -27,11 +27,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index 872a89c6fbc..5ba2300fa10 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_smsc.c,v 1.38 2022/01/09 05:43:00 jsg Exp $ */ +/* $OpenBSD: if_smsc.c,v 1.39 2024/05/23 03:21:08 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ /*- * Copyright (c) 2012 @@ -65,8 +65,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_uaq.c b/sys/dev/usb/if_uaq.c index f02c0f498bf..a0e01ede471 100644 --- a/sys/dev/usb/if_uaq.c +++ b/sys/dev/usb/if_uaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uaq.c,v 1.5 2022/09/01 17:07:09 mlarkin Exp $ */ +/* $OpenBSD: if_uaq.c,v 1.6 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2021 Jonathan Matthew <jonathan@d14n.org> * All rights reserved. @@ -31,10 +31,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> -#include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <machine/bus.h> diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 3367923082f..62087dcc60b 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.88 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_uath.c,v 1.89 2024/05/23 03:21:08 jsg Exp $ */ /*- * Copyright (c) 2006 @@ -31,11 +31,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> @@ -58,7 +55,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> /* needs_reattach() */ -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/if_uathreg.h> diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 156ddde4639..5ca68ddde83 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.85 2021/08/09 07:21:48 jmatthew Exp $ */ +/* $OpenBSD: if_udav.c,v 1.86 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -51,8 +51,6 @@ #include <sys/systm.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c index 83055849db0..8322c37e440 100644 --- a/sys/dev/usb/if_ugl.c +++ b/sys/dev/usb/if_ugl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ugl.c,v 1.27 2021/08/09 07:21:48 jmatthew Exp $ */ +/* $OpenBSD: if_ugl.c,v 1.28 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk> @@ -58,8 +58,6 @@ #include <sys/timeout.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> @@ -74,7 +72,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #define UGL_INTR_PKTLEN 8 diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c index fc3a61c8918..3463dee63e7 100644 --- a/sys/dev/usb/if_umb.c +++ b/sys/dev/usb/if_umb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_umb.c,v 1.57 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_umb.c,v 1.58 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2016 genua mbH @@ -29,7 +29,6 @@ #include <sys/param.h> #include <sys/mbuf.h> -#include <sys/socket.h> #include <sys/systm.h> #include <sys/syslog.h> #include <sys/kstat.h> @@ -44,12 +43,9 @@ #include <netinet/in.h> #include <netinet/in_var.h> -#include <netinet/ip.h> #ifdef INET6 -#include <netinet/ip6.h> #include <netinet6/in6_var.h> -#include <netinet6/ip6_var.h> #include <netinet6/in6_ifattach.h> #include <netinet6/nd6.h> #endif diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 1014943aaab..1254173a5cf 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.89 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -21,11 +21,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 296d5bde489..cf313727c98 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.79 2021/08/09 07:21:48 jmatthew Exp $ */ +/* $OpenBSD: if_upl.c,v 1.80 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -41,8 +41,6 @@ #include <sys/timeout.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> @@ -58,7 +56,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> /* diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c index 3fb897f82ac..01a25297e38 100644 --- a/sys/dev/usb/if_ure.c +++ b/sys/dev/usb/if_ure.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ure.c,v 1.34 2024/04/13 23:44:11 jsg Exp $ */ +/* $OpenBSD: if_ure.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */ /*- * Copyright (c) 2015, 2016, 2019 Kevin Lo <kevlo@openbsd.org> * Copyright (c) 2020 Jonathon Fletcher <jonathon.fletcher@gmail.com> @@ -34,8 +34,6 @@ #include <sys/sockio.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <machine/bus.h> diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index a368914b0d0..0160f2c02c8 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.89 2021/08/09 07:21:48 jmatthew Exp $ */ +/* $OpenBSD: if_url.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -48,8 +48,6 @@ #include <sys/systm.h> #include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index 551197fbfc3..4a65f470e06 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urndis.c,v 1.73 2021/11/05 11:38:52 mpi Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.74 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org> @@ -24,17 +24,13 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> -#include <sys/rwlock.h> #include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/socket.h> #include <sys/device.h> #include <machine/bus.h> #include <net/if.h> -#include <net/if_media.h> #if NBPFILTER > 0 #include <net/bpf.h> @@ -45,8 +41,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdivar.h> #include <dev/usb/usbdevs.h> #include <dev/rndis.h> diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index cd66f1d3102..3902429e6f2 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.72 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.73 2024/05/23 03:21:09 jsg Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -22,11 +22,8 @@ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 3bfa0756c70..f6075bd9fba 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.109 2024/05/06 05:02:25 jsg Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.110 2024/05/23 03:21:09 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -26,13 +26,9 @@ #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/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> @@ -56,7 +51,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/ic/r92creg.h> diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 5e44e6c0208..ec80211c655 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.76 2022/01/09 05:43:00 jsg Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.77 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -27,19 +27,13 @@ * Agency (DARPA) and Air Force Research Laboratory, Air Force * Materiel Command, USAF, under agreement number F30602-01-2-0537. */ -#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> #include <sys/kthread.h> -#include <sys/tree.h> #include <net/if.h> #include <net/if_media.h> @@ -57,10 +51,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <machine/bus.h> #include <dev/ic/if_wireg.h> diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 7e3fa3312ba..030b55a4fba 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.128 2022/04/21 21:03:03 stsp Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.129 2024/05/23 03:21:09 jsg Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -26,12 +26,9 @@ #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/conf.h> #include <sys/device.h> #include <sys/endian.h> diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index 9e7f0549245..7f41ddc582f 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moscom.c,v 1.25 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: moscom.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -18,13 +18,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 043527bcae5..ce85a1c6488 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.25 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uark.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -18,13 +18,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ubcmtp.c b/sys/dev/usb/ubcmtp.c index fd53f52281b..554bc3fb331 100644 --- a/sys/dev/usb/ubcmtp.c +++ b/sys/dev/usb/ubcmtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubcmtp.c,v 1.25 2023/07/02 21:44:04 bru Exp $ */ +/* $OpenBSD: ubcmtp.c,v 1.26 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org> @@ -27,9 +27,7 @@ #include <sys/errno.h> #include <sys/malloc.h> -#include <sys/ioctl.h> #include <sys/systm.h> -#include <sys/tty.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c index f3d2248b130..52752fe7e6e 100644 --- a/sys/dev/usb/uberry.c +++ b/sys/dev/usb/uberry.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uberry.c,v 1.24 2016/11/06 12:58:01 mpi Exp $ */ +/* $OpenBSD: uberry.c,v 1.25 2024/05/23 03:21:09 jsg Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -17,18 +17,10 @@ */ #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/timeout.h> -#include <sys/conf.h> #include <sys/device.h> -#include <sys/endian.h> #include <machine/bus.h> -#include <machine/intr.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 22f534cc487..d1921deb04f 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.69 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: ubsa.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -56,12 +56,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/ioccom.h> -#include <sys/fcntl.h> -#include <sys/conf.h> #include <sys/tty.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 96a71fadc2a..c620ea9f40f 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uchcom.c,v 1.35 2024/05/15 01:41:19 kevlo Exp $ */ +/* $OpenBSD: uchcom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/tty.h> #include <sys/device.h> @@ -46,7 +45,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 336d3a3a46d..f0fcc822c9d 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.78 2023/10/06 16:06:11 krw Exp $ */ +/* $OpenBSD: ucom.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/ioctl.h> #include <sys/conf.h> @@ -51,7 +50,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/uhidev.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ucrcom.c b/sys/dev/usb/ucrcom.c index 34654197a76..2e72873b109 100644 --- a/sys/dev/usb/ucrcom.c +++ b/sys/dev/usb/ucrcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucrcom.c,v 1.2 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: ucrcom.c,v 1.3 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org> @@ -18,13 +18,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index 0eb2455e3df..d3ffaacdc3f 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucycom.c,v 1.41 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: ucycom.c,v 1.42 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */ /* @@ -40,8 +40,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/tty.h> @@ -50,7 +48,6 @@ #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c index 4b0b2f05e83..f5a70848507 100644 --- a/sys/dev/usb/udcf.c +++ b/sys/dev/usb/udcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udcf.c,v 1.65 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: udcf.c,v 1.66 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/time.h> #include <sys/sensors.h> @@ -26,7 +25,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #ifdef UDCF_DEBUG diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 2136a6dc930..e19ce99251f 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.99 2023/05/10 18:28:04 miod Exp $ */ +/* $OpenBSD: udl.c,v 1.100 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index 288c24c79ab..17a4ca9ebde 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uftdi.c,v 1.78 2022/12/30 00:54:09 kevlo Exp $ */ +/* $OpenBSD: uftdi.c,v 1.79 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */ /* @@ -41,15 +41,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/tty.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 194a39a8792..94dd45da4b1 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.117 2022/12/19 15:10:40 visa Exp $ */ +/* $OpenBSD: ugen.c,v 1.118 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma 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> #include <sys/ioctl.h> @@ -50,7 +49,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdivar.h> #ifdef UGEN_DEBUG #define DPRINTF(x) do { if (ugendebug) printf x; } while (0) diff --git a/sys/dev/usb/ugold.c b/sys/dev/usb/ugold.c index c761e5a9f1a..86e503d9e54 100644 --- a/sys/dev/usb/ugold.c +++ b/sys/dev/usb/ugold.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugold.c,v 1.27 2023/12/21 19:40:47 miod Exp $ */ +/* $OpenBSD: ugold.c,v 1.28 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2013 Takayoshi SASANO <uaa@openbsd.org> @@ -26,7 +26,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/sensors.h> diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index a036e3f1213..f472954456a 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.90 2023/04/20 10:49:57 brynet Exp $ */ +/* $OpenBSD: uhid.c,v 1.91 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -40,21 +40,16 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/signalvar.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/conf.h> #include <sys/tty.h> #include <sys/selinfo.h> -#include <sys/proc.h> #include <sys/vnode.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index c0664fbf239..37f60cb8b53 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.109 2023/08/12 20:47:06 miod Exp $ */ +/* $OpenBSD: uhidev.c,v 1.110 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -37,12 +37,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/signalvar.h> #include <sys/device.h> -#include <sys/ioctl.h> -#include <sys/conf.h> #include <machine/bus.h> diff --git a/sys/dev/usb/uhidpp.c b/sys/dev/usb/uhidpp.c index 163e4f2e736..a95716b1e22 100644 --- a/sys/dev/usb/uhidpp.c +++ b/sys/dev/usb/uhidpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidpp.c,v 1.43 2023/01/08 06:54:51 anton Exp $ */ +/* $OpenBSD: uhidpp.c,v 1.44 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/mutex.h> #include <sys/sensors.h> diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index d9f944f46a2..80ed1c956ac 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.97 2022/09/04 08:42:39 mglocker Exp $ */ +/* $OpenBSD: uhub.c,v 1.98 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -34,7 +34,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/usb/uipaq.c b/sys/dev/usb/uipaq.c index c5aa8a03c09..bc50979afc8 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipaq.c,v 1.28 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uipaq.c,v 1.29 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -42,9 +42,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/tty.h> #include <dev/usb/usb.h> @@ -52,7 +50,6 @@ #include <dev/usb/usbcdc.h> /*UCDC_* stuff */ #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/ujoy.c b/sys/dev/usb/ujoy.c index 8728e4b215b..9d7d48ceddc 100644 --- a/sys/dev/usb/ujoy.c +++ b/sys/dev/usb/ujoy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ujoy.c,v 1.4 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: ujoy.c,v 1.5 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2021 Thomas Frohwein <thfr@openbsd.org> @@ -19,23 +19,16 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/signalvar.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/conf.h> #include <sys/tty.h> -#include <sys/proc.h> -#include <sys/vnode.h> #include <sys/fcntl.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/uhidev.h> #include <dev/usb/uhid.h> diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index bb25422622e..9d0e80d10fe 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbd.c,v 1.89 2023/12/05 20:49:31 miod Exp $ */ +/* $OpenBSD: ukbd.c,v 1.90 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -53,9 +53,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/timeout.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <machine/bus.h> diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 699a491d4b4..07644351fad 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.81 2022/08/23 15:58:57 anton Exp $ */ +/* $OpenBSD: umass.c,v 1.82 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -126,11 +126,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/conf.h> -#include <sys/buf.h> #include <sys/device.h> -#include <sys/timeout.h> #include <machine/bus.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index d19fc5a41f6..562841c72cd 100644 --- a/sys/dev/usb/umass_quirks.c +++ b/sys/dev/usb/umass_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_quirks.c,v 1.34 2020/08/26 13:57:20 krw Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */ /* @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/buf.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index 16f466baa88..1d563716aa6 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.64 2023/05/10 15:28:26 krw Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.65 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,11 +32,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/conf.h> -#include <sys/buf.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/malloc.h> #include <dev/usb/usb.h> @@ -48,7 +44,6 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <scsi/scsi_disk.h> #include <machine/bus.h> struct umass_scsi_softc { diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c index 62e5bd017c7..a9acbb14edd 100644 --- a/sys/dev/usb/umbg.c +++ b/sys/dev/usb/umbg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umbg.c,v 1.28 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: umbg.c,v 1.29 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org> @@ -18,8 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/time.h> #include <sys/sensors.h> @@ -27,7 +25,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #ifdef UMBG_DEBUG diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c index 1929f9e50ed..be37e0f8f8e 100644 --- a/sys/dev/usb/umcs.c +++ b/sys/dev/usb/umcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umcs.c,v 1.11 2023/04/10 12:11:22 jsg Exp $ */ +/* $OpenBSD: umcs.c,v 1.12 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */ /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */ @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/tty.h> #include <sys/device.h> @@ -50,7 +49,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 31e9fac33c8..a419da9bfb8 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umct.c,v 1.50 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: umct.c,v 1.51 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,10 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/ioctl.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> @@ -48,7 +45,6 @@ #include <dev/usb/usbcdc.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 2fc5a091c50..a6be8c15cd4 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.56 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: umidi.c,v 1.57 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,16 +31,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/ioctl.h> -#include <sys/conf.h> #include <sys/fcntl.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/umidireg.h> #include <dev/usb/umidivar.h> diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c index 9f1e5d7227e..97e07b775d5 100644 --- a/sys/dev/usb/umidi_quirks.c +++ b/sys/dev/usb/umidi_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi_quirks.c,v 1.17 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: umidi_quirks.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */ /* @@ -32,18 +32,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/device.h> -#include <sys/ioctl.h> -#include <sys/conf.h> - -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/umidireg.h> -#include <dev/usb/umidivar.h> #include <dev/usb/umidi_quirks.h> /* diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index b1b24920045..a6ed9827c4f 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umodem.c,v 1.69 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: umodem.c,v 1.70 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ /* @@ -46,8 +46,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index c217e9bcbfd..239e853fa00 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ums.c,v 1.51 2021/11/22 11:29:17 anton Exp $ */ +/* $OpenBSD: ums.c,v 1.52 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -37,9 +37,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index 144667b50dd..b778280765e 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.125 2023/04/02 23:57:57 dlg Exp $ */ +/* $OpenBSD: umsm.c,v 1.126 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2008 Yojiro UO <yuo@nui.org> @@ -21,10 +21,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/tty.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/umstc.c b/sys/dev/usb/umstc.c index 4bebeb41811..410e35103ce 100644 --- a/sys/dev/usb/umstc.c +++ b/sys/dev/usb/umstc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umstc.c,v 1.7 2021/11/22 11:29:18 anton Exp $ */ +/* $OpenBSD: umstc.c,v 1.8 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2020 joshua stein <jcs@jcs.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/atomic.h> #include <sys/task.h> @@ -36,7 +35,6 @@ #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> -#include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include "audio.h" diff --git a/sys/dev/usb/umt.c b/sys/dev/usb/umt.c index d3cab557ee9..aea4412e5cd 100644 --- a/sys/dev/usb/umt.c +++ b/sys/dev/usb/umt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umt.c,v 1.6 2024/05/13 01:15:53 jsg Exp $ */ +/* $OpenBSD: umt.c,v 1.7 2024/05/23 03:21:09 jsg Exp $ */ /* * USB multitouch touchpad driver for devices conforming to * Windows Precision Touchpad standard @@ -22,15 +22,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/usb_quirks.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/uoak_subr.c b/sys/dev/usb/uoak_subr.c index c6d16240ae6..c10e535f68d 100644 --- a/sys/dev/usb/uoak_subr.c +++ b/sys/dev/usb/uoak_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoak_subr.c,v 1.10 2022/01/09 05:43:01 jsg Exp $ */ +/* $OpenBSD: uoak_subr.c,v 1.11 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -21,16 +21,13 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> #include "uoak.h" diff --git a/sys/dev/usb/uoaklux.c b/sys/dev/usb/uoaklux.c index fee39e26877..ad5bbc1f24b 100644 --- a/sys/dev/usb/uoaklux.c +++ b/sys/dev/usb/uoaklux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoaklux.c,v 1.17 2022/04/09 20:09:03 naddy Exp $ */ +/* $OpenBSD: uoaklux.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -21,10 +21,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/uoakrh.c b/sys/dev/usb/uoakrh.c index 4d8b253d6dd..5c68425c533 100644 --- a/sys/dev/usb/uoakrh.c +++ b/sys/dev/usb/uoakrh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoakrh.c,v 1.19 2022/04/09 20:09:03 naddy Exp $ */ +/* $OpenBSD: uoakrh.c,v 1.20 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -21,10 +21,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/uoakv.c b/sys/dev/usb/uoakv.c index 221b659e0f5..8052c2bd714 100644 --- a/sys/dev/usb/uoakv.c +++ b/sys/dev/usb/uoakv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoakv.c,v 1.17 2022/04/09 20:09:03 naddy Exp $ */ +/* $OpenBSD: uoakv.c,v 1.18 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -21,10 +21,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/uonerng.c b/sys/dev/usb/uonerng.c index 31f008b591b..35b5a8456c2 100644 --- a/sys/dev/usb/uonerng.c +++ b/sys/dev/usb/uonerng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uonerng.c,v 1.6 2022/01/09 05:43:02 jsg Exp $ */ +/* $OpenBSD: uonerng.c,v 1.7 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (C) 2015 Devin Reade <gdr@gno.org> * Copyright (C) 2015 Sean Levy <attila@stalphonsos.com> @@ -33,14 +33,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/time.h> #include <sys/timeout.h> #include <machine/bus.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdivar.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/usbcdc.h> diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c index 299429170d9..c7622f018c9 100644 --- a/sys/dev/usb/uow.c +++ b/sys/dev/usb/uow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uow.c,v 1.37 2020/07/31 10:49:33 mglocker Exp $ */ +/* $OpenBSD: uow.c,v 1.38 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 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 <dev/onewire/onewirereg.h> #include <dev/onewire/onewirevar.h> @@ -31,7 +30,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdevs.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/uowreg.h> diff --git a/sys/dev/usb/upd.c b/sys/dev/usb/upd.c index c65ef9f54cd..9fa5fd73ac1 100644 --- a/sys/dev/usb/upd.c +++ b/sys/dev/usb/upd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: upd.c,v 1.31 2021/11/15 15:36:24 anton Exp $ */ +/* $OpenBSD: upd.c,v 1.32 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2015 David Higgs <higgsd@gmail.com> @@ -24,7 +24,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> @@ -32,10 +31,8 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/usbhid.h> #include <dev/usb/uhidev.h> -#include <dev/usb/usbdi_util.h> #ifdef UPD_DEBUG #define DPRINTF(x) do { printf x; } while (0) diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 603bfb3cd91..78fb44635ea 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.80 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: uplcom.c,v 1.81 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -39,10 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/ioctl.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> @@ -50,7 +47,6 @@ #include <dev/usb/usbcdc.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/urng.c b/sys/dev/usb/urng.c index 566e227a90d..2708c6ea24c 100644 --- a/sys/dev/usb/urng.c +++ b/sys/dev/usb/urng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urng.c,v 1.10 2020/05/29 04:42:25 deraadt Exp $ */ +/* $OpenBSD: urng.c,v 1.11 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2017 Jasper Lievisse Adriaanse <jasper@openbsd.org> @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/time.h> #include <sys/timeout.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 2d9c26e6930..87ca505bbbe 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.130 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: usb.c,v 1.131 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -42,20 +42,16 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/timeout.h> #include <sys/kthread.h> #include <sys/conf.h> #include <sys/fcntl.h> -#include <sys/signalvar.h> #include <sys/time.h> #include <sys/rwlock.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <machine/bus.h> diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index 82d36deb8ae..d8e18d3b340 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.h,v 1.62 2021/01/27 17:28:19 mglocker Exp $ */ +/* $OpenBSD: usb.h,v 1.63 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ @@ -37,7 +37,6 @@ #define _USB_H_ #include <sys/types.h> -#include <sys/time.h> #include <sys/ioctl.h> diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c index d0b37e54766..6dec6d52764 100644 --- a/sys/dev/usb/usb_mem.c +++ b/sys/dev/usb/usb_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_mem.c,v 1.34 2020/03/21 12:08:31 patrick Exp $ */ +/* $OpenBSD: usb_mem.c,v 1.35 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */ /* @@ -40,10 +40,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/queue.h> -#include <sys/timeout.h> #include <sys/device.h> /* for usbdivar.h */ #include <machine/bus.h> diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 60997d7ffec..b20a61f1c60 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.162 2023/10/06 16:06:11 krw Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.163 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -34,7 +34,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/usb/usbdi.c b/sys/dev/usb/usbdi.c index 1483faf72e1..7fdb9bbeb4e 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.c,v 1.110 2021/02/03 11:34:24 mglocker Exp $ */ +/* $OpenBSD: usbdi.c,v 1.111 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c index efb3ad72a95..2bc4e5a23ad 100644 --- a/sys/dev/usb/usbdi_util.c +++ b/sys/dev/usb/usbdi_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi_util.c,v 1.46 2021/02/24 03:54:05 jsg Exp $ */ +/* $OpenBSD: usbdi_util.c,v 1.47 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */ @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <machine/bus.h> diff --git a/sys/dev/usb/uscom.c b/sys/dev/usb/uscom.c index fc2c06a7415..04f934a214a 100644 --- a/sys/dev/usb/uscom.c +++ b/sys/dev/usb/uscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscom.c,v 1.8 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uscom.c,v 1.9 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -18,14 +18,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c index 5a14e9ef033..5dafbd1684c 100644 --- a/sys/dev/usb/uslcom.c +++ b/sys/dev/usb/uslcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uslcom.c,v 1.44 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uslcom.c,v 1.45 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -18,13 +18,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uslhcom.c b/sys/dev/usb/uslhcom.c index 9e45cfdf526..4990666a3f8 100644 --- a/sys/dev/usb/uslhcom.c +++ b/sys/dev/usb/uslhcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uslhcom.c,v 1.9 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uslhcom.c,v 1.10 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2015 SASANO Takayoshi <uaa@openbsd.org> @@ -22,15 +22,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/usbhid.h> diff --git a/sys/dev/usb/usps.c b/sys/dev/usb/usps.c index f54e5feaa83..4bfcece95ad 100644 --- a/sys/dev/usb/usps.c +++ b/sys/dev/usb/usps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usps.c,v 1.11 2024/05/15 04:36:28 jsg Exp $ */ +/* $OpenBSD: usps.c,v 1.12 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2011 Yojiro UO <yuo@nui.org> @@ -20,15 +20,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #ifdef USPS_DEBUG diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c index ce118a5e593..fe62a41c72f 100644 --- a/sys/dev/usb/uthum.c +++ b/sys/dev/usb/uthum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthum.c,v 1.39 2023/12/04 05:28:25 mglocker Exp $ */ +/* $OpenBSD: uthum.c,v 1.40 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org> @@ -20,15 +20,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index b2964acaee9..92d83077f7c 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.35 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uticom.c,v 1.36 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -26,10 +26,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/tty.h> #include <machine/bus.h> diff --git a/sys/dev/usb/utpms.c b/sys/dev/usb/utpms.c index 27acdb6a58c..9debe3cb1d9 100644 --- a/sys/dev/usb/utpms.c +++ b/sys/dev/usb/utpms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utpms.c,v 1.13 2022/01/09 05:43:02 jsg Exp $ */ +/* $OpenBSD: utpms.c,v 1.14 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -107,10 +107,7 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/errno.h> - -#include <sys/ioctl.h> #include <sys/systm.h> -#include <sys/tty.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/usb/utrh.c b/sys/dev/usb/utrh.c index a77f2ed8e1f..315279eba62 100644 --- a/sys/dev/usb/utrh.c +++ b/sys/dev/usb/utrh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utrh.c,v 1.26 2022/01/09 05:43:02 jsg Exp $ */ +/* $OpenBSD: utrh.c,v 1.27 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2009 Yojiro UO <yuo@nui.org> @@ -20,16 +20,13 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index dda8e6fbe9c..a01be522ceb 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.44 2023/04/26 08:38:51 bentley Exp $ */ +/* $OpenBSD: uts.c,v 1.45 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -17,22 +17,14 @@ */ #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/conf.h> #include <sys/device.h> -#include <sys/endian.h> #include <machine/intr.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/dev/usb/utvfu.c b/sys/dev/usb/utvfu.c index e6807f992e0..832a18100ba 100644 --- a/sys/dev/usb/utvfu.c +++ b/sys/dev/usb/utvfu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utvfu.c,v 1.19 2022/10/28 15:02:20 kn Exp $ */ +/* $OpenBSD: utvfu.c,v 1.20 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2013 Lubomir Rintel * Copyright (c) 2013 Federico Simoncelli @@ -47,7 +47,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> -#include <sys/kernel.h> #include <sys/kthread.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/usb/utwitch.c b/sys/dev/usb/utwitch.c index 1a1ff0cbc97..4cf6a747f49 100644 --- a/sys/dev/usb/utwitch.c +++ b/sys/dev/usb/utwitch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utwitch.c,v 1.22 2021/11/15 15:36:24 anton Exp $ */ +/* $OpenBSD: utwitch.c,v 1.23 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2010 Yojiro UO <yuo@nui.org> @@ -21,16 +21,13 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/sensors.h> #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 7769034d800..b24fd8e5d07 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.219 2022/10/21 18:29:37 kn Exp $ */ +/* $OpenBSD: uvideo.c,v 1.220 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -19,15 +19,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/ioctl.h> -#include <sys/tty.h> -#include <sys/fcntl.h> -#include <sys/lock.h> #include <sys/stat.h> -#include <sys/timeout.h> #include <sys/kthread.h> #include <sys/stdint.h> diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index c3ed21fcfee..b8178f3cf27 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.53 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uvisor.c,v 1.54 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -37,15 +37,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> -#include <sys/conf.h> #include <sys/tty.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index 66003c7b520..22d29725d9c 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.42 2022/07/02 08:50:42 visa Exp $ */ +/* $OpenBSD: uvscom.c,v 1.43 2024/05/23 03:21:09 jsg Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -37,19 +37,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/fcntl.h> -#include <sys/conf.h> #include <sys/tty.h> -#include <sys/ioctl.h> #include <sys/device.h> #include <dev/usb/usb.h> -#include <dev/usb/usbcdc.h> - #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uxrcom.c b/sys/dev/usb/uxrcom.c index 70d07bb3cb6..ed2af90950c 100644 --- a/sys/dev/usb/uxrcom.c +++ b/sys/dev/usb/uxrcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uxrcom.c,v 1.3 2022/04/09 20:07:44 naddy Exp $ */ +/* $OpenBSD: uxrcom.c,v 1.4 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -18,14 +18,12 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/tty.h> #include <sys/device.h> #include <dev/usb/usb.h> #include <dev/usb/usbcdc.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c index 324bc0162c0..cf9ef254b9f 100644 --- a/sys/dev/usb/xhci.c +++ b/sys/dev/usb/xhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xhci.c,v 1.130 2023/07/20 09:43:00 claudio Exp $ */ +/* $OpenBSD: xhci.c,v 1.131 2024/05/23 03:21:09 jsg Exp $ */ /* * Copyright (c) 2014-2015 Martin Pieuchot @@ -18,7 +18,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> |