The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ca48e43ba9ee73a07cdbad8365117793b01273bb
commit ca48e43ba9ee73a07cdbad8365117793b01273bb
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2025-03-04 21:42:28 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2025-03-04 21:44:22 +0000
usb: Kill left-over cdefs.h includes
These includes were for __FBSD_RCSID() macro. They weren't formatted
like the rest of the tree so weren't trimmed automatically when that
script was run. Trim them now.
MFC After: 1 week
Sponsored by: Netflix
---
sys/dev/usb/controller/dwc3/dwc3.c | 1 -
sys/dev/usb/controller/dwc_otg_acpi.c | 1 -
sys/dev/usb/controller/ehci_fsl.c | 1 -
sys/dev/usb/controller/ehci_imx.c | 1 -
sys/dev/usb/controller/ehci_msm.c | 1 -
sys/dev/usb/controller/ehci_mv.c | 1 -
sys/dev/usb/controller/ehci_pci.c | 1 -
sys/dev/usb/controller/generic_ehci.c | 1 -
sys/dev/usb/controller/generic_ehci_acpi.c | 1 -
sys/dev/usb/controller/generic_ehci_fdt.c | 1 -
sys/dev/usb/controller/generic_xhci.c | 1 -
sys/dev/usb/controller/generic_xhci_acpi.c | 1 -
sys/dev/usb/controller/generic_xhci_fdt.c | 1 -
sys/dev/usb/controller/ohci_pci.c | 1 -
sys/dev/usb/controller/uhci_pci.c | 1 -
sys/dev/usb/controller/xhci_pci.c | 1 -
sys/dev/usb/controller/xlnx_dwc3.c | 2 --
sys/dev/usb/input/atp.c | 1 -
sys/dev/usb/input/uhid.c | 1 -
sys/dev/usb/input/ukbd.c | 1 -
sys/dev/usb/input/ums.c | 1 -
sys/dev/usb/input/usbhid.c | 1 -
sys/dev/usb/input/wmt.c | 1 -
sys/dev/usb/input/wsp.c | 1 -
sys/dev/usb/misc/udbp.c | 1 -
sys/dev/usb/misc/ugold.c | 1 -
sys/dev/usb/misc/uled.c | 1 -
sys/dev/usb/net/if_aue.c | 1 -
sys/dev/usb/net/if_axe.c | 1 -
sys/dev/usb/net/if_axge.c | 1 -
sys/dev/usb/net/if_cdce.c | 1 -
sys/dev/usb/net/if_cdceem.c | 1 -
sys/dev/usb/net/if_cue.c | 1 -
sys/dev/usb/net/if_ipheth.c | 1 -
sys/dev/usb/net/if_kue.c | 1 -
sys/dev/usb/net/if_mos.c | 1 -
sys/dev/usb/net/if_muge.c | 1 -
sys/dev/usb/net/if_rue.c | 1 -
sys/dev/usb/net/if_smsc.c | 1 -
sys/dev/usb/net/if_udav.c | 1 -
sys/dev/usb/net/if_urndis.c | 1 -
sys/dev/usb/net/ruephy.c | 1 -
sys/dev/usb/serial/ubsa.c | 1 -
sys/dev/usb/serial/ubser.c | 1 -
sys/dev/usb/serial/uchcom.c | 1 -
sys/dev/usb/serial/ucycom.c | 1 -
sys/dev/usb/serial/ufoma.c | 1 -
sys/dev/usb/serial/uftdi.c | 1 -
sys/dev/usb/serial/uipaq.c | 1 -
sys/dev/usb/serial/ulpt.c | 1 -
sys/dev/usb/serial/umcs.c | 1 -
sys/dev/usb/serial/umct.c | 1 -
sys/dev/usb/serial/umodem.c | 1 -
sys/dev/usb/serial/uplcom.c | 1 -
sys/dev/usb/serial/usb_serial.c | 1 -
sys/dev/usb/serial/uslcom.c | 1 -
sys/dev/usb/serial/uvscom.c | 1 -
sys/dev/usb/storage/umass.c | 1 -
sys/dev/usb/storage/urio.c | 1 -
sys/dev/usb/template/usb_template_multi.c | 1 -
sys/dev/usb/template/usb_template_serialnet.c | 1 -
sys/dev/usb/wlan/if_rsu.c | 1 -
sys/dev/usb/wlan/if_rum.c | 1 -
sys/dev/usb/wlan/if_run.c | 1 -
sys/dev/usb/wlan/if_uath.c | 1 -
sys/dev/usb/wlan/if_ural.c | 1 -
sys/dev/usb/wlan/if_urtw.c | 1 -
sys/dev/usb/wlan/if_zyd.c | 1 -
68 files changed, 69 deletions(-)
diff --git a/sys/dev/usb/controller/dwc3/dwc3.c
b/sys/dev/usb/controller/dwc3/dwc3.c
index 7ba6165431ac..39b5d3ae4cb1 100644
--- a/sys/dev/usb/controller/dwc3/dwc3.c
+++ b/sys/dev/usb/controller/dwc3/dwc3.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_platform.h"
#include "opt_acpi.h"
diff --git a/sys/dev/usb/controller/dwc_otg_acpi.c
b/sys/dev/usb/controller/dwc_otg_acpi.c
index 5d509911a54a..d8deaa80e94e 100644
--- a/sys/dev/usb/controller/dwc_otg_acpi.c
+++ b/sys/dev/usb/controller/dwc_otg_acpi.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_acpi.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/ehci_fsl.c
b/sys/dev/usb/controller/ehci_fsl.c
index ed3d4c64f4f8..ce1749775ab2 100644
--- a/sys/dev/usb/controller/ehci_fsl.c
+++ b/sys/dev/usb/controller/ehci_fsl.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/ehci_imx.c
b/sys/dev/usb/controller/ehci_imx.c
index caba6b7da85a..149b26f04760 100644
--- a/sys/dev/usb/controller/ehci_imx.c
+++ b/sys/dev/usb/controller/ehci_imx.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* EHCI driver for Freescale i.MX SoCs which incorporate the USBOH3 controller.
*/
diff --git a/sys/dev/usb/controller/ehci_msm.c
b/sys/dev/usb/controller/ehci_msm.c
index 7f06ad6a1600..2586df634b3c 100644
--- a/sys/dev/usb/controller/ehci_msm.c
+++ b/sys/dev/usb/controller/ehci_msm.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c
index 817cd68257c8..5dc72d4af3d8 100644
--- a/sys/dev/usb/controller/ehci_mv.c
+++ b/sys/dev/usb/controller/ehci_mv.c
@@ -35,7 +35,6 @@
* FDT attachment driver for the USB Enhanced Host Controller.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/stdint.h>
diff --git a/sys/dev/usb/controller/ehci_pci.c
b/sys/dev/usb/controller/ehci_pci.c
index bc75669a8d20..d7298ab89df7 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
*
diff --git a/sys/dev/usb/controller/generic_ehci.c
b/sys/dev/usb/controller/generic_ehci.c
index 35a9564631e0..bd7dc32b1ea8 100644
--- a/sys/dev/usb/controller/generic_ehci.c
+++ b/sys/dev/usb/controller/generic_ehci.c
@@ -32,7 +32,6 @@
* Generic EHCI driver based on the Allwinner A10 EHCI driver
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/generic_ehci_acpi.c
b/sys/dev/usb/controller/generic_ehci_acpi.c
index f565590fa09a..d947215ad355 100644
--- a/sys/dev/usb/controller/generic_ehci_acpi.c
+++ b/sys/dev/usb/controller/generic_ehci_acpi.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/generic_ehci_fdt.c
b/sys/dev/usb/controller/generic_ehci_fdt.c
index af22d0bdef73..df2dc7fba4b9 100644
--- a/sys/dev/usb/controller/generic_ehci_fdt.c
+++ b/sys/dev/usb/controller/generic_ehci_fdt.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/generic_xhci.c
b/sys/dev/usb/controller/generic_xhci.c
index f64e1fd01ba0..16bda77e043d 100644
--- a/sys/dev/usb/controller/generic_xhci.c
+++ b/sys/dev/usb/controller/generic_xhci.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/generic_xhci_acpi.c
b/sys/dev/usb/controller/generic_xhci_acpi.c
index 2cb5977e0cf1..e24fe1b1bcc3 100644
--- a/sys/dev/usb/controller/generic_xhci_acpi.c
+++ b/sys/dev/usb/controller/generic_xhci_acpi.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_acpi.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/generic_xhci_fdt.c
b/sys/dev/usb/controller/generic_xhci_fdt.c
index 66fc1ab65a23..8aab938cbc77 100644
--- a/sys/dev/usb/controller/generic_xhci_fdt.c
+++ b/sys/dev/usb/controller/generic_xhci_fdt.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_bus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/ohci_pci.c
b/sys/dev/usb/controller/ohci_pci.c
index 027be4ce9588..0edcebcb0b38 100644
--- a/sys/dev/usb/controller/ohci_pci.c
+++ b/sys/dev/usb/controller/ohci_pci.c
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* USB Open Host Controller driver.
*
diff --git a/sys/dev/usb/controller/uhci_pci.c
b/sys/dev/usb/controller/uhci_pci.c
index 0dc2763aed8d..97f6d09f9e65 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/* Universal Host Controller Interface
*
* UHCI spec: http://www.intel.com/
diff --git a/sys/dev/usb/controller/xhci_pci.c
b/sys/dev/usb/controller/xhci_pci.c
index c436f60aefcf..b50e33ea36ce 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/controller/xlnx_dwc3.c
b/sys/dev/usb/controller/xlnx_dwc3.c
index ab2e9b899b2a..c450734e4225 100644
--- a/sys/dev/usb/controller/xlnx_dwc3.c
+++ b/sys/dev/usb/controller/xlnx_dwc3.c
@@ -29,8 +29,6 @@
* Xilinx DWC3 glue
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c
index fa78f7d7221b..41ab37c6f1cc 100644
--- a/sys/dev/usb/input/atp.c
+++ b/sys/dev/usb/input/atp.c
@@ -58,7 +58,6 @@
* giving me an opportunity to do this work.
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index 098ec4364df7..a31081663f0c 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -4,7 +4,6 @@
* $NetBSD: uhid.c,v 1.54 2002/09/23 05:51:21 simonb Exp $
*/
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index 9ff093628312..57e9beac34b6 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -1,4 +1,3 @@
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index 067feed13e92..523ec4d05db9 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
*/
diff --git a/sys/dev/usb/input/usbhid.c b/sys/dev/usb/input/usbhid.c
index e88588182ae5..3bb7d5e594e3 100644
--- a/sys/dev/usb/input/usbhid.c
+++ b/sys/dev/usb/input/usbhid.c
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* HID spec: https://www.usb.org/sites/default/files/documents/hid1_11.pdf
*/
diff --git a/sys/dev/usb/input/wmt.c b/sys/dev/usb/input/wmt.c
index 23692e77a0fa..03e4da35a9fe 100644
--- a/sys/dev/usb/input/wmt.c
+++ b/sys/dev/usb/input/wmt.c
@@ -24,7 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* MS Windows 7/8/10 compatible USB HID Multi-touch Device driver.
*
https://msdn.microsoft.com/en-us/library/windows/hardware/jj151569(v=vs.85).aspx
diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c
index a8d6c14c7421..4c41dcdbba8f 100644
--- a/sys/dev/usb/input/wsp.c
+++ b/sys/dev/usb/input/wsp.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_evdev.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/misc/udbp.c b/sys/dev/usb/misc/udbp.c
index 61f77837ffbd..1d348557e1a1 100644
--- a/sys/dev/usb/misc/udbp.c
+++ b/sys/dev/usb/misc/udbp.c
@@ -30,7 +30,6 @@
*
*/
-#include <sys/cdefs.h>
/* Driver for arbitrary double bulk pipe devices.
* The driver assumes that there will be the same driver on the other side.
*
diff --git a/sys/dev/usb/misc/ugold.c b/sys/dev/usb/misc/ugold.c
index d322348ee333..1b5f54bc679b 100644
--- a/sys/dev/usb/misc/ugold.c
+++ b/sys/dev/usb/misc/ugold.c
@@ -19,7 +19,6 @@
/* Driver for Microdia's HID based TEMPer Temperature sensor */
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/misc/uled.c b/sys/dev/usb/misc/uled.c
index 6fc325522f20..7608524cddee 100644
--- a/sys/dev/usb/misc/uled.c
+++ b/sys/dev/usb/misc/uled.c
@@ -25,7 +25,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index 3bd6dd50f7b7..84268c60a780 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -35,7 +35,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.
* Datasheet is available from http://www.admtek.com.tw.
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index ed40a1e415c3..117a3daa170f 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -32,7 +32,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver.
* Used in the LinkSys USB200M and various other adapters.
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index cae1d61feb34..cb8f0fafff45 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* ASIX Electronics AX88178A/AX88179/AX88179A USB 2.0/3.0 gigabit ethernet
* driver.
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index cbb6ae76ef0c..25697c8ec4c9 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -47,7 +47,6 @@
* http://www.usb.org/developers/devclass_docs/NCM10.zip
*/
-#include <sys/cdefs.h>
#include <sys/gsb_crc32.h>
#include <sys/eventhandler.h>
#include <sys/stdint.h>
diff --git a/sys/dev/usb/net/if_cdceem.c b/sys/dev/usb/net/if_cdceem.c
index 07ce7328a3ca..b4978e5ea394 100644
--- a/sys/dev/usb/net/if_cdceem.c
+++ b/sys/dev/usb/net/if_cdceem.c
@@ -37,7 +37,6 @@
* https://usb.org/sites/default/files/CDC_EEM10.pdf
*/
-#include <sys/cdefs.h>
#include <sys/gsb_crc32.h>
#include <sys/eventhandler.h>
#include <sys/stdint.h>
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index e7b6d6cbbca4..a65bafee066f 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -32,7 +32,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate
* adapters and others.
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index dfb9463cf024..f70113c53eb4 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -31,7 +31,6 @@
* the Apple iPhone Ethernet driver.
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index 9398b7ac98ee..55c531e278fb 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -32,7 +32,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver.
*
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index b0ad55e726b5..442bfb27d83f 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -80,7 +80,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller
* The datasheet is available at the following URL:
diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c
index dd4a89aa8b05..a39343b2e3c9 100644
--- a/sys/dev/usb/net/if_muge.c
+++ b/sys/dev/usb/net/if_muge.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* USB-To-Ethernet adapter driver for Microchip's LAN78XX and related families.
*
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 1c11e70e63a6..d1b46887cd20 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -58,7 +58,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* RealTek RTL8150 USB to fast ethernet controller driver.
* Datasheet is available from
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 58809de4ad3a..0ebbf8482446 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Microchip LAN9xxx devices (https://www.microchip.com/en-us/product/lan9500a)
*
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 6517a4a0e7b7..1554f0a4cd57 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -44,7 +44,6 @@
* External PHYs
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/net/if_urndis.c b/sys/dev/usb/net/if_urndis.c
index 0a7cb3fed953..4b0582442e30 100644
--- a/sys/dev/usb/net/if_urndis.c
+++ b/sys/dev/usb/net/if_urndis.c
@@ -20,7 +20,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index 05ed5cc6586a..2b5358ab8d0c 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -27,7 +27,6 @@
*
*/
-#include <sys/cdefs.h>
/*
* driver for RealTek RTL8150 internal PHY
*/
diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c
index 5ff207a17c62..38782d5aef11 100644
--- a/sys/dev/usb/serial/ubsa.c
+++ b/sys/dev/usb/serial/ubsa.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index 91fefceb8240..978639a809be 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -64,7 +64,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* BWCT serial adapter driver
*/
diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c
index a61b5a92364c..a886b25c89d7 100644
--- a/sys/dev/usb/serial/uchcom.c
+++ b/sys/dev/usb/serial/uchcom.c
@@ -57,7 +57,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* Driver for WinChipHead CH341/340, the worst USB-serial chip in the
* world.
diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c
index 664cb7f05263..5ab1810a0d11 100644
--- a/sys/dev/usb/serial/ucycom.c
+++ b/sys/dev/usb/serial/ucycom.c
@@ -1,4 +1,3 @@
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index 66002f57e3b9..3fc6a7a609ba 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -1,6 +1,5 @@
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
-#include <sys/cdefs.h>
#define UFOMA_HANDSFREE
/*-
* SPDX-License-Identifier: BSD-2-Clause
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index 3b0400d9b353..b06dc38432be 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*
* NOTE: all function names beginning like "uftdi_cfg_" can only
* be called from within the config thread function !
diff --git a/sys/dev/usb/serial/uipaq.c b/sys/dev/usb/serial/uipaq.c
index 2b282009a8bb..f24f1e215767 100644
--- a/sys/dev/usb/serial/uipaq.c
+++ b/sys/dev/usb/serial/uipaq.c
@@ -43,7 +43,6 @@
* Contact i...@cs.umd.edu if you have any questions/comments about this driver
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/serial/ulpt.c b/sys/dev/usb/serial/ulpt.c
index b1e4232ff2a3..ec25ad737596 100644
--- a/sys/dev/usb/serial/ulpt.c
+++ b/sys/dev/usb/serial/ulpt.c
@@ -1,4 +1,3 @@
-#include <sys/cdefs.h>
/* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */
/*-
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index 18135e3bf67d..8b9b7807ac61 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -39,7 +39,6 @@
* quad-port mos7840.
*
*/
-#include <sys/cdefs.h>
#include <sys/stdint.h>
#include <sys/stddef.h>
#include <sys/param.h>
diff --git a/sys/dev/usb/serial/umct.c b/sys/dev/usb/serial/umct.c
index 4329cf293098..bf6c672907e0 100644
--- a/sys/dev/usb/serial/umct.c
+++ b/sys/dev/usb/serial/umct.c
@@ -1,4 +1,3 @@
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 08d3be554915..59aa5b21e85f 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -1,6 +1,5 @@
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index 88278ef5790e..1fd73f1f7665 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -1,6 +1,5 @@
/* $NetBSD: uplcom.c,v 1.21 2001/11/13 06:24:56 lukem Exp $ */
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index dfae051ecfd6..e62bfdb8ff1d 100644
--- a/sys/dev/usb/serial/usb_serial.c
+++ b/sys/dev/usb/serial/usb_serial.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c
index 1c27788f77ce..26b937d0b200 100644
--- a/sys/dev/usb/serial/uslcom.c
+++ b/sys/dev/usb/serial/uslcom.c
@@ -1,6 +1,5 @@
/* $OpenBSD: uslcom.c,v 1.17 2007/11/24 10:52:12 jsg Exp $ */
-#include <sys/cdefs.h>
/*
* Copyright (c) 2006 Jonathan Gray <j...@openbsd.org>
*
diff --git a/sys/dev/usb/serial/uvscom.c b/sys/dev/usb/serial/uvscom.c
index ee34f0ad3f3d..b9add5c1b37b 100644
--- a/sys/dev/usb/serial/uvscom.c
+++ b/sys/dev/usb/serial/uvscom.c
@@ -1,6 +1,5 @@
/* $NetBSD: usb/uvscom.c,v 1.1 2002/03/19 15:08:42 augustss Exp $ */
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index 9137f3eb895e..58f36e756dce 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -1,4 +1,3 @@
-#include <sys/cdefs.h>
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
diff --git a/sys/dev/usb/storage/urio.c b/sys/dev/usb/storage/urio.c
index e733ae4dfcba..c13aab44e435 100644
--- a/sys/dev/usb/storage/urio.c
+++ b/sys/dev/usb/storage/urio.c
@@ -30,7 +30,6 @@
* its contributors.
*/
-#include <sys/cdefs.h>
/*
* 2000/3/24 added NetBSD/OpenBSD support (from Alex Nemirovsky)
* 2000/3/07 use two bulk-pipe handles for read and write (Dirk)
diff --git a/sys/dev/usb/template/usb_template_multi.c
b/sys/dev/usb/template/usb_template_multi.c
index 2533459be799..be36e5ea70df 100644
--- a/sys/dev/usb/template/usb_template_multi.c
+++ b/sys/dev/usb/template/usb_template_multi.c
@@ -37,7 +37,6 @@
* USB template for CDC ACM (serial), CDC ECM (network), and CDC MSC (storage).
*/
-#include <sys/cdefs.h>
#ifdef USB_GLOBAL_INCLUDE_FILE
#include USB_GLOBAL_INCLUDE_FILE
#else
diff --git a/sys/dev/usb/template/usb_template_serialnet.c
b/sys/dev/usb/template/usb_template_serialnet.c
index adcc561ccd21..6ee43f7f1f28 100644
--- a/sys/dev/usb/template/usb_template_serialnet.c
+++ b/sys/dev/usb/template/usb_template_serialnet.c
@@ -37,7 +37,6 @@
* This file contains the USB template for USB Networking and Serial
*/
-#include <sys/cdefs.h>
#ifdef USB_GLOBAL_INCLUDE_FILE
#include USB_GLOBAL_INCLUDE_FILE
#else
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 997a739562f6..35deed163706 100644
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -15,7 +15,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*
* Driver for Realtek RTL8188SU/RTL8191SU/RTL8192SU.
*
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 48674d84ffe3..b822766f0ba5 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -18,7 +18,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*-
* Ralink Technology RT2501USB/RT2601USB chipset driver
* http://www.ralinktech.com.tw/
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index 81f4d172241f..00e005fd7d4d 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*-
* Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
* http://www.ralinktech.com/
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index e4493ba50a30..28c176df1f14 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -50,7 +50,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*-
* Driver for Atheros AR5523 USB parts.
*
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index c47b8cbeb3ae..260d75a9821d 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -19,7 +19,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*-
* Ralink Technology RT2500USB chipset driver
* http://www.ralinktech.com/
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index 1a7a1eba4758..439faeefc408 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -14,7 +14,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include "opt_wlan.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 1815dc04cd09..1a698caef3c5 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -18,7 +18,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
/*
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
