12 files changed, 15 insertions, 46 deletions

diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c
index ee3feb8c23f9f..822b5ce90f2c3 100644
--- a/sys/dev/usb/controller/at91dci_atmelarm.c
+++ b/sys/dev/usb/controller/at91dci_atmelarm.c
@@ -346,10 +346,7 @@ static device_method_t at91_udp_methods[] = {
 	DEVMETHOD(device_detach, at91_udp_detach),
 	DEVMETHOD(device_shutdown, at91_udp_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t at91_udp_driver = {
diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c
index 8d033909d2f7e..ed766d0b95e65 100644
--- a/sys/dev/usb/controller/atmegadci_atmelarm.c
+++ b/sys/dev/usb/controller/atmegadci_atmelarm.c
@@ -215,10 +215,7 @@ static device_method_t atmegadci_methods[] = {
 	DEVMETHOD(device_detach, atmegadci_detach),
 	DEVMETHOD(device_shutdown, atmegadci_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t atmegadci_driver = {
diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c
index 8ea133fb7c52f..7f7cde86396ca 100644
--- a/sys/dev/usb/controller/ehci_ixp4xx.c
+++ b/sys/dev/usb/controller/ehci_ixp4xx.c
@@ -339,10 +339,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, ehci_ixp_resume),
 	DEVMETHOD(device_shutdown, ehci_ixp_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {
diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c
index bbfb6a7924c0d..90dc2b08018fe 100644
--- a/sys/dev/usb/controller/ehci_mv.c
+++ b/sys/dev/usb/controller/ehci_mv.c
@@ -376,10 +376,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, mv_ehci_resume),
 	DEVMETHOD(device_shutdown, mv_ehci_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {
diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c
index 6abb19348d016..25ccc6fc3f9ce 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -586,10 +586,8 @@ static driver_t ehci_driver =
 		DEVMETHOD(device_suspend, ehci_pci_suspend),
 		DEVMETHOD(device_resume, ehci_pci_resume),
 		DEVMETHOD(device_shutdown, ehci_pci_shutdown),
-		/* bus interface */
-		DEVMETHOD(bus_print_child, bus_generic_print_child),
 
-		{0, 0}
+		DEVMETHOD_END
 	},
 	.size = sizeof(struct ehci_softc),
 };
diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c
index 8a48264486b3c..37522f884fc87 100644
--- a/sys/dev/usb/controller/musb_otg_atmelarm.c
+++ b/sys/dev/usb/controller/musb_otg_atmelarm.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -24,6 +23,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/stdint.h>
 #include <sys/stddef.h>
 #include <sys/param.h>
@@ -238,10 +240,7 @@ static device_method_t musbotg_methods[] = {
 	DEVMETHOD(device_detach, musbotg_detach),
 	DEVMETHOD(device_shutdown, musbotg_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t musbotg_driver = {
diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c
index 9a397407f92ec..122f705064b08 100644
--- a/sys/dev/usb/controller/ohci_atmelarm.c
+++ b/sys/dev/usb/controller/ohci_atmelarm.c
@@ -223,10 +223,7 @@ static device_method_t ohci_methods[] = {
 	DEVMETHOD(device_detach, ohci_atmelarm_detach),
 	DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ohci_driver = {
diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c
index 9ff6e31825c04..f7fa27328dc8c 100644
--- a/sys/dev/usb/controller/ohci_pci.c
+++ b/sys/dev/usb/controller/ohci_pci.c
@@ -393,10 +393,7 @@ static driver_t ohci_driver =
 		DEVMETHOD(device_resume, ohci_pci_resume),
 		DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
-		/* bus interface */
-		DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-		{0, 0}
+		DEVMETHOD_END
 	},
 	.size = sizeof(struct ohci_softc),
 };
diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c
index 11b2579b220e1..480d04036daa6 100644
--- a/sys/dev/usb/controller/ohci_s3c24x0.c
+++ b/sys/dev/usb/controller/ohci_s3c24x0.c
@@ -200,10 +200,7 @@ static device_method_t ohci_methods[] = {
 	DEVMETHOD(device_detach, ohci_s3c24x0_detach),
 	DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ohci_driver = {
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c
index 3192aac30f772..b3fa7a11e5b97 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -459,9 +459,7 @@ static driver_t uhci_driver =
 		DEVMETHOD(device_resume, uhci_pci_resume),
 		DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
-		/* Bus interface */
-		DEVMETHOD(bus_print_child, bus_generic_print_child),
-		{0, 0}
+		DEVMETHOD_END
 	},
 	.size = sizeof(struct uhci_softc),
 };
diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c
index a8bd197d05599..f40f0f57c5449 100644
--- a/sys/dev/usb/controller/uss820dci_atmelarm.c
+++ b/sys/dev/usb/controller/uss820dci_atmelarm.c
@@ -76,10 +76,7 @@ static device_method_t uss820dci_methods[] = {
 	DEVMETHOD(device_resume, uss820_atmelarm_resume),
 	DEVMETHOD(device_shutdown, uss820_atmelarm_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t uss820dci_driver = {
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
index 40358bfa570fa..f25c88e88bfc8 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -75,10 +75,8 @@ static device_method_t xhci_device_methods[] = {
 	DEVMETHOD(device_suspend, xhci_pci_suspend),
 	DEVMETHOD(device_resume, xhci_pci_resume),
 	DEVMETHOD(device_shutdown, xhci_pci_shutdown),
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xhci_driver = {