156 files changed, 238 insertions, 585 deletions

diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 06d7d17a7366c..40da8b660ef05 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -237,19 +237,17 @@ static device_method_t cpu_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	cpu_add_child),
 	DEVMETHOD(bus_read_ivar,	cpu_read_ivar),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
 	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
 	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cpu_driver = {
diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/econa/ehci_ebus.c
index 8d5bed2d8f5db..8403da929f830 100644
--- a/sys/arm/econa/ehci_ebus.c
+++ b/sys/arm/econa/ehci_ebus.c
@@ -281,10 +281,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, ehci_ebus_resume),
 	DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {
diff --git a/sys/arm/econa/ohci_ec.c b/sys/arm/econa/ohci_ec.c
index 6b25580f647ba..5d103a3b5a4a7 100644
--- a/sys/arm/econa/ohci_ec.c
+++ b/sys/arm/econa/ohci_ec.c
@@ -222,10 +222,7 @@ static device_method_t ohci_methods[] = {
 	DEVMETHOD(device_detach, ohci_ec_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/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index c7fda644a55fa..6afa921cdba8b 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -171,7 +171,6 @@ static device_method_t mv_pcib_methods[] = {
 	DEVMETHOD(device_attach,		mv_pcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		mv_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,		mv_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource,		mv_pcib_alloc_resource),
@@ -194,7 +193,7 @@ static device_method_t mv_pcib_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,     ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,     ofw_bus_gen_get_type),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mv_pcib_driver = {
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index 45b676d554c42..36c90d683dc76 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -373,7 +373,6 @@ static device_method_t i80321_pci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	i80321_read_ivar),
 	DEVMETHOD(bus_write_ivar,	i80321_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	i80321_pci_alloc_resource),
@@ -389,7 +388,7 @@ static device_method_t i80321_pci_methods[] = {
 	DEVMETHOD(pcib_write_config,	i80321_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	machdep_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t i80321_pci_driver = {
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 0b3693ebb2ec8..17cc7cda32aa7 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -516,7 +516,6 @@ static device_method_t i81342_pci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	i81342_read_ivar),
 	DEVMETHOD(bus_write_ivar,	i81342_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	i81342_pci_alloc_resource),
@@ -532,7 +531,7 @@ static device_method_t i81342_pci_methods[] = {
 	DEVMETHOD(pcib_write_config,	i81342_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	i81342_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t i81342_pci_driver = {
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index 9b106006432c0..b7513fc7e92b0 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -445,7 +445,6 @@ static device_method_t ixppcib_methods[] = {
 	DEVMETHOD(device_attach,		ixppcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		ixppcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,		ixppcib_write_ivar),
 	DEVMETHOD(bus_setup_intr,		ixppcib_setup_intr),
@@ -462,7 +461,7 @@ static device_method_t ixppcib_methods[] = {
 	DEVMETHOD(pcib_write_config,		ixppcib_write_config),
 	DEVMETHOD(pcib_route_interrupt,		ixppcib_route_interrupt),
 
-	{0, 0},
+	DEVMETHOD_END
 };
 
 static driver_t ixppcib_driver = {
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 6f59e68053db3..485d5ffabcdd9 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -68,9 +68,7 @@ static device_method_t aac_methods[] = {
 	DEVMETHOD(device_suspend,	aac_suspend),
 	DEVMETHOD(device_resume,	aac_resume),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t aac_pci_driver = {
diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c
index b0ddd6e516611..16c2dd8bdce28 100644
--- a/sys/dev/acpi_support/acpi_wmi.c
+++ b/sys/dev/acpi_support/acpi_wmi.c
@@ -175,7 +175,6 @@ static device_method_t acpi_wmi_methods[] = {
 
 	/* bus interface */
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
 	/* acpi_wmi interface */
 	DEVMETHOD(acpi_wmi_provides_guid_string,
@@ -189,7 +188,7 @@ static device_method_t acpi_wmi_methods[] = {
 	DEVMETHOD(acpi_wmi_get_block, acpi_wmi_get_block_method),
 	DEVMETHOD(acpi_wmi_set_block, acpi_wmi_set_block_method),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t acpi_wmi_driver = {
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index d26903d22a58f..29034e1873e06 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -187,13 +187,12 @@ static device_method_t acpi_cpu_methods[] = {
     DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
     DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
     DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
-    DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
     DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
     DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
     DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
 
-    {0, 0}
+    DEVMETHOD_END
 };
 
 static driver_t acpi_cpu_driver = {
diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c
index 0da0182463450..3febea7ed76bd 100644
--- a/sys/dev/acpica/acpi_isab.c
+++ b/sys/dev/acpica/acpi_isab.c
@@ -68,7 +68,6 @@ static device_method_t acpi_isab_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	acpi_isab_read_ivar),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
@@ -77,7 +76,7 @@ static device_method_t acpi_isab_methods[] = {
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t acpi_isab_driver = {
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 3284fc55df7c6..d0aff3b0581b2 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -106,7 +106,6 @@ static device_method_t acpi_pcib_acpi_methods[] = {
     DEVMETHOD(device_resume,		bus_generic_resume),
 
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_read_ivar,		acpi_pcib_read_ivar),
     DEVMETHOD(bus_write_ivar,		acpi_pcib_write_ivar),
     DEVMETHOD(bus_alloc_resource,	acpi_pcib_acpi_alloc_resource),
@@ -133,7 +132,7 @@ static device_method_t acpi_pcib_acpi_methods[] = {
     DEVMETHOD(pcib_map_msi,		acpi_pcib_map_msi),
     DEVMETHOD(pcib_power_for_sleep,	acpi_pcib_power_for_sleep),
 
-    {0, 0}
+    DEVMETHOD_END
 };
 
 static devclass_t pcib_devclass;
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index d72a129878024..b10c65f5e9bd7 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -106,9 +106,7 @@ static device_method_t amr_methods[] = {
     DEVMETHOD(device_suspend,	amr_pci_suspend),
     DEVMETHOD(device_resume,	amr_pci_resume),
 
-    DEVMETHOD(bus_print_child,	bus_generic_print_child),
-    DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t amr_pci_driver = {
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 10bb5042891cc..b6721765e08da 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -70,8 +70,11 @@
 **     1.20.00.21	03/03/2011		Ching Huang			 if a command timeout, then wait its ccb back before free it
 **     1.20.00.22	07/04/2011		Ching Huang			 Fixed multiple MTX panic
 ******************************************************************************************
-* $FreeBSD$
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if 0
 #define ARCMSR_DEBUG1			1
 #endif
@@ -223,9 +226,8 @@ static device_method_t arcmsr_methods[]={
 	DEVMETHOD(device_shutdown,	arcmsr_shutdown),
 	DEVMETHOD(device_suspend,	arcmsr_suspend),
 	DEVMETHOD(device_resume,	arcmsr_resume),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 	
 static driver_t arcmsr_driver={
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index 39a93aaf10674..e0014c885ed46 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -455,10 +455,6 @@ static device_method_t bce_methods[] = {
 /*	DEVMETHOD(device_resume,	bce_resume),        */
 /*	DEVMETHOD(device_quiesce,	bce_quiesce),       */
 
-	/* Bus interface (bus_if.h) */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface (miibus_if.h) */
 	DEVMETHOD(miibus_readreg,	bce_miibus_read_reg),
 	DEVMETHOD(miibus_writereg,	bce_miibus_write_reg),
@@ -467,7 +463,7 @@ static device_method_t bce_methods[] = {
 /*	DEVMETHOD(miibus_linkchg,	bce_miibus_linkchg),   */
 /*	DEVMETHOD(miibus_mediainit,	bce_miibus_mediainit), */
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t bce_driver = {
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index 7f970f4ac4c63..6dd33cd59129b 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -137,16 +137,12 @@ static device_method_t bfe_methods[] = {
 	DEVMETHOD(device_suspend,	bfe_suspend),
 	DEVMETHOD(device_resume,	bfe_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	bfe_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	bfe_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	bfe_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t bfe_driver = {
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index f7d17302bb816..69d831dacb851 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -493,16 +493,12 @@ static device_method_t bge_methods[] = {
 	DEVMETHOD(device_suspend,	bge_suspend),
 	DEVMETHOD(device_resume,	bge_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	bge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	bge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	bge_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t bge_driver = {
diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c
index c478e7b985a62..872da6dac1c1f 100644
--- a/sys/dev/bm/if_bm.c
+++ b/sys/dev/bm/if_bm.c
@@ -135,15 +135,12 @@ static device_method_t bm_methods[] = {
 	DEVMETHOD(device_detach,	bm_detach),
 	DEVMETHOD(device_shutdown,	bm_shutdown),
 
-	/* bus interface, for miibus */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	bm_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	bm_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	bm_miibus_statchg),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t bm_macio_driver = {
diff --git a/sys/dev/bxe/if_bxe.c b/sys/dev/bxe/if_bxe.c
index 9957359859866..6ccd0454e0260 100644
--- a/sys/dev/bxe/if_bxe.c
+++ b/sys/dev/bxe/if_bxe.c
@@ -400,11 +400,7 @@ static device_method_t bxe_methods[] = {
 	DEVMETHOD(device_detach,	bxe_detach),
 	DEVMETHOD(device_shutdown,	bxe_shutdown),
 
-	/* Bus interface (bus_if.h) */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 858c8bc381ce6..894f46643f988 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -2600,16 +2600,12 @@ static device_method_t cas_pci_methods[] = {
 	/* Use the suspend handler here, it is all that is required. */
 	DEVMETHOD(device_shutdown,	cas_pci_suspend),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	cas_mii_readreg),
 	DEVMETHOD(miibus_writereg,	cas_mii_writereg),
 	DEVMETHOD(miibus_statchg,	cas_mii_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t cas_pci_driver = {
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c
index 54bb8e3f39372..5d67fc61d8860 100644
--- a/sys/dev/cesa/cesa.c
+++ b/sys/dev/cesa/cesa.c
@@ -93,16 +93,12 @@ static device_method_t cesa_methods[] = {
 	DEVMETHOD(device_attach,	cesa_attach),
 	DEVMETHOD(device_detach,	cesa_detach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* Crypto device methods */
 	DEVMETHOD(cryptodev_newsession,	cesa_newsession),
 	DEVMETHOD(cryptodev_freesession,cesa_freesession),
 	DEVMETHOD(cryptodev_process,	cesa_process),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cesa_driver = {
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index ae32221de64f2..c5d46a04046cd 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -129,11 +129,7 @@ static device_method_t cxgb_controller_methods[] = {
 	DEVMETHOD(device_attach,	cxgb_controller_attach),
 	DEVMETHOD(device_detach,	cxgb_controller_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cxgb_controller_driver = {
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index b7cb09a16daff..adca421ea0a34 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -73,11 +73,7 @@ static device_method_t t4_methods[] = {
 	DEVMETHOD(device_attach,	t4_attach),
 	DEVMETHOD(device_detach,	t4_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t t4_driver = {
 	"t4nex",
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index b9ea19ae4bccf..0ace34ef1a831 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -337,17 +337,13 @@ static device_method_t dc_methods[] = {
 	DEVMETHOD(device_resume,	dc_resume),
 	DEVMETHOD(device_shutdown,	dc_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	dc_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	dc_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	dc_miibus_statchg),
 	DEVMETHOD(miibus_mediainit,	dc_miibus_mediainit),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dc_driver = {
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 689efb6ad15c0..8ec3419a36dcc 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -557,7 +557,6 @@ static device_method_t eisa_methods[] = {
 	DEVMETHOD(bus_probe_nomatch,	eisa_probe_nomatch),
 	DEVMETHOD(bus_read_ivar,	eisa_read_ivar),
 	DEVMETHOD(bus_write_ivar,	eisa_write_ivar),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_alloc_resource,	eisa_alloc_resource),
 	DEVMETHOD(bus_release_resource,	eisa_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -570,7 +569,7 @@ static device_method_t eisa_methods[] = {
 	DEVMETHOD(eisa_add_iospace,	eisa_add_iospace_m),
 	DEVMETHOD(eisa_add_mspace,	eisa_add_mspace_m),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t eisa_driver = {
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
index 539224a4b2916..f91a85209dfb1 100644
--- a/sys/dev/et/if_et.c
+++ b/sys/dev/et/if_et.c
@@ -170,14 +170,11 @@ static device_method_t et_methods[] = {
 	DEVMETHOD(device_detach,	et_detach),
 	DEVMETHOD(device_shutdown,	et_shutdown),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	DEVMETHOD(miibus_readreg,	et_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	et_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	et_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t et_driver = {
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index b201d29be61a8..183e20c7962e1 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -315,8 +315,7 @@ static device_method_t fb_methods[] = {
 	DEVMETHOD(device_probe,		fbprobe),
 	DEVMETHOD(device_attach,	fbattach),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fb_driver = {
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 490f39bcfb4de..aa0f1aa554bdc 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -30,11 +30,11 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -128,9 +128,8 @@ static device_method_t firewire_methods[] = {
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	firewire_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 char *linkspeed[] = {
 	"S100", "S200", "S400", "S800",
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 0bb66a9ed5eeb..979f587c1ff61 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -30,10 +30,11 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- * 
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define BOUNCE_BUFFER_TEST	0
 
 #include <sys/param.h>
@@ -536,9 +537,8 @@ static device_method_t fwohci_methods[] = {
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	fwohci_pci_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fwohci_driver = {
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index c5e1acd8fa8bb..a3376fd1df117 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -82,16 +82,12 @@ static device_method_t gem_pci_methods[] = {
 	/* Use the suspend handler here, it is all that is required. */
 	DEVMETHOD(device_shutdown,	gem_pci_suspend),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	gem_mii_readreg),
 	DEVMETHOD(miibus_writereg,	gem_mii_writereg),
 	DEVMETHOD(miibus_statchg,	gem_mii_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t gem_pci_driver = {
diff --git a/sys/dev/gem/if_gem_sbus.c b/sys/dev/gem/if_gem_sbus.c
index 205285d08e051..4265b8c543c9e 100644
--- a/sys/dev/gem/if_gem_sbus.c
+++ b/sys/dev/gem/if_gem_sbus.c
@@ -78,16 +78,12 @@ static device_method_t gem_sbus_methods[] = {
 	/* Use the suspend handler here, it is all that is required. */
 	DEVMETHOD(device_shutdown,	gem_sbus_suspend),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	gem_mii_readreg),
 	DEVMETHOD(miibus_writereg,	gem_mii_writereg),
 	DEVMETHOD(miibus_statchg,	gem_mii_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t gem_sbus_driver = {
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index 54644a2fc7d09..7167daa336a7b 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -458,7 +458,6 @@ static device_method_t gpiobus_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	gpiobus_add_child),
 	DEVMETHOD(bus_print_child,	gpiobus_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_child_pnpinfo_str, gpiobus_child_pnpinfo_str),
 	DEVMETHOD(bus_child_location_str, gpiobus_child_location_str),
 	DEVMETHOD(bus_hinted_child,	gpiobus_hinted_child),
@@ -475,7 +474,7 @@ static device_method_t gpiobus_methods[] = {
 	DEVMETHOD(gpiobus_pin_set,	gpiobus_pin_set),
 	DEVMETHOD(gpiobus_pin_toggle,	gpiobus_pin_toggle),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t gpiobus_driver = {
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 2da5a9e59a103..7e3a65f7931cb 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -113,16 +113,12 @@ static device_method_t hifn_methods[] = {
 	DEVMETHOD(device_resume,	hifn_resume),
 	DEVMETHOD(device_shutdown,	hifn_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* crypto device methods */
 	DEVMETHOD(cryptodev_newsession,	hifn_newsession),
 	DEVMETHOD(cryptodev_freesession,hifn_freesession),
 	DEVMETHOD(cryptodev_process,	hifn_process),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t hifn_driver = {
 	"hifn",
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index 9f68df2d7a1d0..d114fd8f6da86 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -93,16 +93,12 @@ static device_method_t hme_pci_methods[] = {
 	/* Can just use the suspend method here. */
 	DEVMETHOD(device_shutdown,	hme_pci_suspend),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	hme_mii_readreg),
 	DEVMETHOD(miibus_writereg,	hme_mii_writereg),
 	DEVMETHOD(miibus_statchg,	hme_mii_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hme_pci_driver = {
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 846ee11d2cef8..946597e06c632 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -95,16 +95,12 @@ static device_method_t hme_sbus_methods[] = {
 	/* Can just use the suspend method here. */
 	DEVMETHOD(device_shutdown,	hme_sbus_suspend),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	hme_mii_readreg),
 	DEVMETHOD(miibus_writereg,	hme_mii_writereg),
 	DEVMETHOD(miibus_statchg,	hme_mii_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hme_sbus_driver = {
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 48d6eb6e177ea..d4fb7770a28cd 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -103,9 +103,6 @@ static device_method_t ichsmb_pci_methods[] = {
         DEVMETHOD(device_attach, ichsmb_pci_attach),
         DEVMETHOD(device_detach, ichsmb_detach),
 
-	/* Bus methods */
-        DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* SMBus methods */
         DEVMETHOD(smbus_callback, ichsmb_callback),
         DEVMETHOD(smbus_quick, ichsmb_quick),
@@ -118,7 +115,8 @@ static device_method_t ichsmb_pci_methods[] = {
         DEVMETHOD(smbus_pcall, ichsmb_pcall),
         DEVMETHOD(smbus_bwrite, ichsmb_bwrite),
         DEVMETHOD(smbus_bread, ichsmb_bread),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t ichsmb_pci_driver = {
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index c33e23591954c..e71c6d4be8979 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -188,9 +188,7 @@ static device_method_t ida_pci_methods[] = {
 	DEVMETHOD(device_attach,	ida_pci_attach),
 	DEVMETHOD(device_detach,	ida_detach),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ida_pci_driver = {
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index b872f9ac52ac3..21fac0de53b1a 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -91,11 +91,9 @@ static device_method_t ndis_methods[] = {
 	DEVMETHOD(device_shutdown,	ndis_shutdown),
 
         /* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ndis_driver = {
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index ca110c85746b4..121b25b20bd8f 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -245,7 +245,6 @@ static device_method_t iicbus_methods[] = {
 
         /* bus interface */
         DEVMETHOD(bus_add_child,	iicbus_add_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
         DEVMETHOD(bus_print_child,      iicbus_print_child),
 	DEVMETHOD(bus_probe_nomatch,	iicbus_probe_nomatch),
 	DEVMETHOD(bus_read_ivar,	iicbus_read_ivar),
@@ -256,7 +255,7 @@ static device_method_t iicbus_methods[] = {
 	/* iicbus interface */
 	DEVMETHOD(iicbus_transfer,	iicbus_transfer),
 
-        { 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t iicbus_driver = {
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 10229acff75d7..27f1d2b055295 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -22,11 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * I2C to SMB bridge
  *
@@ -106,10 +106,6 @@ static device_method_t iicsmb_methods[] = {
 	DEVMETHOD(device_attach,	iicsmb_attach),
 	DEVMETHOD(device_detach,	iicsmb_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-
 	/* iicbus interface */
 	DEVMETHOD(iicbus_intr,		iicsmb_intr),
 
@@ -125,8 +121,8 @@ static device_method_t iicsmb_methods[] = {
 	DEVMETHOD(smbus_pcall,		iicsmb_pcall),
 	DEVMETHOD(smbus_bwrite,		iicsmb_bwrite),
 	DEVMETHOD(smbus_bread,		iicsmb_bread),
-	
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t iicsmb_driver = {
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index c4ddef89774d7..6f69a0a2dc4a0 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -170,16 +170,12 @@ static device_method_t lge_methods[] = {
 	DEVMETHOD(device_detach,	lge_detach),
 	DEVMETHOD(device_shutdown,	lge_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	lge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	lge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	lge_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t lge_driver = {
diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c
index d3f93131a2347..2b4a0b52d2c20 100644
--- a/sys/dev/mca/mca_bus.c
+++ b/sys/dev/mca/mca_bus.c
@@ -507,7 +507,6 @@ static device_method_t mca_methods[] = {
 	DEVMETHOD(bus_probe_nomatch,	mca_probe_nomatch),
 	DEVMETHOD(bus_read_ivar,	mca_read_ivar),
 	DEVMETHOD(bus_write_ivar,	bus_generic_write_ivar),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),     
 
@@ -520,7 +519,7 @@ static device_method_t mca_methods[] = {
 	DEVMETHOD(bus_activate_resource,bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mca_driver = {       
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index 8de2e127d036d..952ab1a3f4676 100644
--- a/sys/dev/mfi/mfi_pci.c
+++ b/sys/dev/mfi/mfi_pci.c
@@ -93,9 +93,8 @@ static device_method_t mfi_methods[] = {
 	DEVMETHOD(device_detach,	mfi_pci_detach),
 	DEVMETHOD(device_suspend,	mfi_pci_suspend),
 	DEVMETHOD(device_resume,	mfi_pci_resume),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t mfi_pci_driver = {
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 2c99bc07e6def..2f07e93739d08 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -82,7 +82,6 @@ static device_method_t miibus_methods[] = {
 	/* bus interface */
 	DEVMETHOD(bus_print_child,	miibus_print_child),
 	DEVMETHOD(bus_read_ivar,	miibus_read_ivar),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_child_pnpinfo_str, miibus_child_pnpinfo_str),
 	DEVMETHOD(bus_child_location_str, miibus_child_location_str),
 	DEVMETHOD(bus_hinted_child,	miibus_hinted_child),
@@ -94,7 +93,7 @@ static device_method_t miibus_methods[] = {
 	DEVMETHOD(miibus_linkchg,	miibus_linkchg),
 	DEVMETHOD(miibus_mediainit,	miibus_mediainit),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 devclass_t miibus_devclass;
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index b39a6b87d0926..00d0fe2bac0f9 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -61,9 +61,7 @@ static device_method_t mlx_methods[] = {
     DEVMETHOD(device_suspend,	mlx_suspend),
     DEVMETHOD(device_resume,	mlx_resume),
 
-    DEVMETHOD(bus_print_child,	bus_generic_print_child),
-    DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t mlx_pci_driver = {
diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c
index 2c57286eae85c..9b2748815be67 100644
--- a/sys/dev/mps/mps_pci.c
+++ b/sys/dev/mps/mps_pci.c
@@ -78,9 +78,8 @@ static device_method_t mps_methods[] = {
 	DEVMETHOD(device_detach,	mps_pci_detach),
 	DEVMETHOD(device_suspend,	mps_pci_suspend),
 	DEVMETHOD(device_resume,	mps_pci_resume),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t mps_pci_driver = {
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 36407a2c1a142..588eb8de854d5 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -334,11 +334,7 @@ static device_method_t mskc_methods[] = {
 	DEVMETHOD(device_resume,	mskc_resume),
 	DEVMETHOD(device_shutdown,	mskc_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t mskc_driver = {
@@ -356,16 +352,12 @@ static device_method_t msk_methods[] = {
 	DEVMETHOD(device_detach,	msk_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	msk_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	msk_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	msk_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t msk_driver = {
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index 3c36fe703b7d0..f4c5bed4192ba 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -165,16 +165,12 @@ static device_method_t nfe_methods[] = {
 	DEVMETHOD(device_resume,	nfe_resume),
 	DEVMETHOD(device_shutdown,	nfe_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	nfe_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	nfe_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	nfe_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t nfe_driver = {
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 3d7ad6302d524..05eec99becdca 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -223,16 +223,12 @@ static device_method_t nge_methods[] = {
 	DEVMETHOD(device_suspend,	nge_suspend),
 	DEVMETHOD(device_resume,	nge_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	nge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	nge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	nge_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t nge_driver = {
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 1428662e90dc0..5c53239156a61 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -184,15 +184,11 @@ static device_method_t nve_methods[] = {
 	DEVMETHOD(device_detach, nve_detach),
 	DEVMETHOD(device_shutdown, nve_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-	DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, nve_miibus_readreg),
 	DEVMETHOD(miibus_writereg, nve_miibus_writereg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t nve_driver = {
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index fb45e6494c5ba..fa990e00eea1f 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -211,7 +211,6 @@ static device_method_t cbb_methods[] = {
 	DEVMETHOD(device_resume,		cbb_resume),
 
 	/* bus methods */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		cbb_read_ivar),
 	DEVMETHOD(bus_write_ivar,		cbb_write_ivar),
 	DEVMETHOD(bus_alloc_resource,		cbb_alloc_resource),
@@ -232,7 +231,7 @@ static device_method_t cbb_methods[] = {
 	DEVMETHOD(power_enable_socket,		cbb_power_enable_socket),
 	DEVMETHOD(power_disable_socket,		cbb_power_disable_socket),
 
-	{0,0}
+	DEVMETHOD_END
 };
 
 static driver_t cbb_isa_driver = {
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 6cdc4e4ab1c6f..eca5ed76c1b59 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -822,7 +822,6 @@ static device_method_t cbb_methods[] = {
 	DEVMETHOD(device_resume,		cbb_resume),
 
 	/* bus methods */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		cbb_read_ivar),
 	DEVMETHOD(bus_write_ivar,		cbb_write_ivar),
 	DEVMETHOD(bus_alloc_resource,		cbb_alloc_resource),
@@ -849,7 +848,7 @@ static device_method_t cbb_methods[] = {
 	DEVMETHOD(pcib_write_config,		cbb_write_config),
 	DEVMETHOD(pcib_route_interrupt,		cbb_route_interrupt),
 
-	{0,0}
+	DEVMETHOD_END
 };
 
 static driver_t cbb_driver = {
diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c
index 61027a1cbc678..98fa2707c305f 100644
--- a/sys/dev/pci/eisa_pci.c
+++ b/sys/dev/pci/eisa_pci.c
@@ -55,7 +55,6 @@ static device_method_t eisab_methods[] = {
     DEVMETHOD(device_resume,		bus_generic_resume),
 
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
     DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
     DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
@@ -63,7 +62,7 @@ static device_method_t eisab_methods[] = {
     DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t eisab_driver = {
diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c
index be3f3ac9393ee..4f9e2a2d35f3e 100644
--- a/sys/dev/pci/isa_pci.c
+++ b/sys/dev/pci/isa_pci.c
@@ -67,7 +67,6 @@ static device_method_t isab_methods[] = {
     DEVMETHOD(device_resume,		bus_generic_resume),
 
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_alloc_resource,	isab_pci_alloc_resource),
     DEVMETHOD(bus_release_resource,	isab_pci_release_resource),
     DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
@@ -75,7 +74,7 @@ static device_method_t isab_methods[] = {
     DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 struct isab_pci_resource {
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index fa14816792d3e..d624104f25c6b 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -67,7 +67,6 @@ static device_method_t pcib_methods[] = {
     DEVMETHOD(device_resume,		pcib_resume),
 
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_read_ivar,		pcib_read_ivar),
     DEVMETHOD(bus_write_ivar,		pcib_write_ivar),
     DEVMETHOD(bus_alloc_resource,	pcib_alloc_resource),
@@ -95,7 +94,7 @@ static device_method_t pcib_methods[] = {
     DEVMETHOD(pcib_map_msi,		pcib_map_msi),
     DEVMETHOD(pcib_power_for_sleep,	pcib_power_for_sleep),
 
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static devclass_t pcib_devclass;
diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c
index 2ebd35c95a483..de072ad97adf4 100644
--- a/sys/dev/pcn/if_pcn.c
+++ b/sys/dev/pcn/if_pcn.c
@@ -173,16 +173,12 @@ static device_method_t pcn_methods[] = {
 	DEVMETHOD(device_detach,	pcn_detach),
 	DEVMETHOD(device_shutdown,	pcn_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	pcn_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	pcn_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	pcn_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pcn_driver = {
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 6cf747e2b6aa5..0c85620675bf0 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -245,9 +245,6 @@ static device_method_t lpbb_methods[] = {
 	DEVMETHOD(device_probe,		lpbb_probe),
 	DEVMETHOD(device_attach,	lpbb_attach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-
 	/* iicbb interface */
 	DEVMETHOD(iicbb_callback,	lpbb_callback),
 	DEVMETHOD(iicbb_setsda,		lpbb_setsda),
@@ -256,7 +253,7 @@ static device_method_t lpbb_methods[] = {
 	DEVMETHOD(iicbb_getscl,		lpbb_getscl),
 	DEVMETHOD(iicbb_reset,		lpbb_reset),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t lpbb_driver = {
diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c
index 63d57876fca4a..370c6afc8892f 100644
--- a/sys/dev/puc/puc_pccard.c
+++ b/sys/dev/puc/puc_pccard.c
@@ -85,8 +85,8 @@ static device_method_t puc_pccard_methods[] = {
     DEVMETHOD(bus_print_child,		puc_bus_print_child),
     DEVMETHOD(bus_child_pnpinfo_str,	puc_bus_child_pnpinfo_str),
     DEVMETHOD(bus_child_location_str,	puc_bus_child_location_str),
-    DEVMETHOD(bus_driver_added,		bus_generic_driver_added),
-    { 0, 0 }
+
+    DEVMETHOD_END
 };
 
 static driver_t puc_pccard_driver = {
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index 8c14717d9bd00..4ad1e3a4b093b 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -135,8 +135,8 @@ static device_method_t puc_pci_methods[] = {
     DEVMETHOD(bus_print_child,		puc_bus_print_child),
     DEVMETHOD(bus_child_pnpinfo_str,	puc_bus_child_pnpinfo_str),
     DEVMETHOD(bus_child_location_str,	puc_bus_child_location_str),
-    DEVMETHOD(bus_driver_added,		bus_generic_driver_added),
-    { 0, 0 }
+
+    DEVMETHOD_END
 };
 
 static driver_t puc_pci_driver = {
diff --git a/sys/dev/quicc/quicc_bfe_fdt.c b/sys/dev/quicc/quicc_bfe_fdt.c
index e1fd2d5ad1ecb..382b2a10c6d51 100644
--- a/sys/dev/quicc/quicc_bfe_fdt.c
+++ b/sys/dev/quicc/quicc_bfe_fdt.c
@@ -59,10 +59,8 @@ static device_method_t quicc_fdt_methods[] = {
 	DEVMETHOD(bus_read_ivar,	quicc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	quicc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	quicc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t quicc_fdt_driver = {
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 3ade04ccb463f..d911a19294ca9 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -313,16 +313,12 @@ static device_method_t re_methods[] = {
 	DEVMETHOD(device_resume,	re_resume),
 	DEVMETHOD(device_shutdown,	re_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	re_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	re_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	re_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t re_driver = {
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index edaf95e85b36b..a1667e523df3d 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -2588,17 +2588,14 @@ static device_method_t rt_dev_methods[] =
 	DEVMETHOD(device_suspend, rt_suspend),
 	DEVMETHOD(device_resume, rt_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 #ifdef IF_RT_PHY_SUPPORT
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	rt_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	rt_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	rt_miibus_statchg),
 #endif
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t rt_driver =
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 00c00ea2268c9..a8fbbbb885744 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -99,16 +99,12 @@ static device_method_t safe_methods[] = {
 	DEVMETHOD(device_resume,	safe_resume),
 	DEVMETHOD(device_shutdown,	safe_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* crypto device methods */
 	DEVMETHOD(cryptodev_newsession,	safe_newsession),
 	DEVMETHOD(cryptodev_freesession,safe_freesession),
 	DEVMETHOD(cryptodev_process,	safe_process),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t safe_driver = {
 	"safe",
diff --git a/sys/dev/scc/scc_bfe_ebus.c b/sys/dev/scc/scc_bfe_ebus.c
index 6c944f7341ef9..2b71a6716ad2a 100644
--- a/sys/dev/scc/scc_bfe_ebus.c
+++ b/sys/dev/scc/scc_bfe_ebus.c
@@ -84,9 +84,8 @@ static device_method_t scc_ebus_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_ebus_driver = {
diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c
index 1d7bf82bfcfde..042788d14d3bb 100644
--- a/sys/dev/scc/scc_bfe_macio.c
+++ b/sys/dev/scc/scc_bfe_macio.c
@@ -80,9 +80,8 @@ static device_method_t scc_macio_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_macio_driver = {
diff --git a/sys/dev/scc/scc_bfe_quicc.c b/sys/dev/scc/scc_bfe_quicc.c
index f92aa52d1d92d..c7e97f3e697fc 100644
--- a/sys/dev/scc/scc_bfe_quicc.c
+++ b/sys/dev/scc/scc_bfe_quicc.c
@@ -88,9 +88,8 @@ static device_method_t scc_quicc_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_quicc_driver = {
diff --git a/sys/dev/scc/scc_bfe_sbus.c b/sys/dev/scc/scc_bfe_sbus.c
index 8eb963fa0b4ad..ba6b25a66b930 100644
--- a/sys/dev/scc/scc_bfe_sbus.c
+++ b/sys/dev/scc/scc_bfe_sbus.c
@@ -80,9 +80,8 @@ static device_method_t scc_sbus_methods[] = {
 	DEVMETHOD(bus_read_ivar,	scc_bus_read_ivar),
 	DEVMETHOD(bus_setup_intr,	scc_bus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	scc_bus_teardown_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t scc_sbus_driver = {
diff --git a/sys/dev/sec/sec.c b/sys/dev/sec/sec.c
index 36fc9cea7435f..3b8c1036578a2 100644
--- a/sys/dev/sec/sec.c
+++ b/sys/dev/sec/sec.c
@@ -135,16 +135,12 @@ static device_method_t sec_methods[] = {
 	DEVMETHOD(device_resume,	sec_resume),
 	DEVMETHOD(device_shutdown,	sec_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* Crypto methods */
 	DEVMETHOD(cryptodev_newsession,	sec_newsession),
 	DEVMETHOD(cryptodev_freesession,sec_freesession),
 	DEVMETHOD(cryptodev_process,	sec_process),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t sec_driver = {
 	"sec",
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index e919f5519ab82..251f310ae5d93 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -212,16 +212,12 @@ static device_method_t sf_methods[] = {
 	DEVMETHOD(device_suspend,	sf_suspend),
 	DEVMETHOD(device_resume,	sf_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	sf_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	sf_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	sf_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t sf_driver = {
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 380215a3ef544..18428cf523a93 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -757,11 +757,7 @@ static device_method_t sfxge_methods[] = {
 	DEVMETHOD(device_attach,	sfxge_attach),
 	DEVMETHOD(device_detach,	sfxge_detach),
 
-	/* Bus interface. */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t sfxge_devclass;
diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
index c56760d89746a..68679fe893400 100644
--- a/sys/dev/sge/if_sge.c
+++ b/sys/dev/sge/if_sge.c
@@ -158,16 +158,12 @@ static device_method_t sge_methods[] = {
 	DEVMETHOD(device_resume,	sge_resume),
 	DEVMETHOD(device_shutdown,	sge_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	sge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	sge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	sge_miibus_statchg),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t sge_driver = {
diff --git a/sys/dev/siba/siba_pcib.c b/sys/dev/siba/siba_pcib.c
index d6ddeb695ab8c..6236aedcbe0a7 100644
--- a/sys/dev/siba/siba_pcib.c
+++ b/sys/dev/siba/siba_pcib.c
@@ -403,7 +403,6 @@ static device_method_t siba_pcib_methods[] = {
 	DEVMETHOD(device_probe,		siba_pcib_probe),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	siba_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,	siba_pcib_write_ivar),
 	DEVMETHOD(bus_setup_intr,	siba_pcib_setup_intr),
@@ -419,7 +418,7 @@ static device_method_t siba_pcib_methods[] = {
 	DEVMETHOD(pcib_write_config,	siba_pcib_write_config),
 	DEVMETHOD(pcib_route_interrupt,	siba_pcib_route_interrupt),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static driver_t siba_pcib_driver = {
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index 630281d893ae5..ba8106ea79da4 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -2393,16 +2393,12 @@ static device_method_t sis_methods[] = {
 	DEVMETHOD(device_suspend,	sis_suspend),
 	DEVMETHOD(device_resume,	sis_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	sis_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	sis_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	sis_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sis_driver = {
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 4d2abb845ec74..b2177849bb207 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -296,11 +296,7 @@ static device_method_t skc_methods[] = {
 	DEVMETHOD(device_resume,	skc_resume),
 	DEVMETHOD(device_shutdown,	skc_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t skc_driver = {
@@ -318,16 +314,12 @@ static device_method_t sk_methods[] = {
 	DEVMETHOD(device_detach,	sk_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	sk_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	sk_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	sk_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sk_driver = {
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 1c17f6d68b1c4..a111332c6d976 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -55,11 +55,10 @@ static device_method_t smbus_methods[] = {
         DEVMETHOD(device_attach,        smbus_attach),
         DEVMETHOD(device_detach,        smbus_detach),
 
-        /* bus interface */
+	/* bus interface */
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-        DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-        { 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t smbus_driver = {
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index ef211c6d7d971..58ac3461d7ef2 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -644,7 +644,6 @@ static device_method_t gusc_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	gusc_alloc_resource),
 	DEVMETHOD(bus_release_resource,	gusc_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -652,7 +651,7 @@ static device_method_t gusc_methods[] = {
 	DEVMETHOD(bus_setup_intr,	gusc_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t gusc_driver = {
diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c
index 3df273816f798..aa6003b60736b 100644
--- a/sys/dev/sound/isa/sbc.c
+++ b/sys/dev/sound/isa/sbc.c
@@ -790,7 +790,6 @@ static device_method_t sbc_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	sbc_read_ivar),
 	DEVMETHOD(bus_write_ivar,	sbc_write_ivar),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	sbc_alloc_resource),
 	DEVMETHOD(bus_release_resource,	sbc_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -798,7 +797,7 @@ static device_method_t sbc_methods[] = {
 	DEVMETHOD(bus_setup_intr,	sbc_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	sbc_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sbc_driver = {
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 28eae75adbe6e..04ea4ec29bd2e 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -1076,7 +1076,6 @@ static device_method_t csa_methods[] = {
 	DEVMETHOD(device_resume,	csa_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	csa_alloc_resource),
 	DEVMETHOD(bus_release_resource,	csa_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -1084,7 +1083,7 @@ static device_method_t csa_methods[] = {
 	DEVMETHOD(bus_setup_intr,	csa_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	csa_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t csa_driver = {
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index 9f006522d1c78..ccfef36ebe0c0 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -276,7 +276,7 @@ fm801_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data)
 static kobj_method_t fm801_ac97_methods[] = {
     	KOBJMETHOD(ac97_read,		fm801_rdcd),
     	KOBJMETHOD(ac97_write,		fm801_wrcd),
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 AC97_DECLARE(fm801_ac97);
 
@@ -530,7 +530,7 @@ static kobj_method_t fm801ch_methods[] = {
     	KOBJMETHOD(channel_trigger,		fm801ch_trigger),
     	KOBJMETHOD(channel_getptr,		fm801ch_getptr),
     	KOBJMETHOD(channel_getcaps,		fm801ch_getcaps),
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 CHANNEL_DECLARE(fm801ch);
 
@@ -749,12 +749,12 @@ static device_method_t fm801_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	fm801_alloc_resource),
 	DEVMETHOD(bus_release_resource,	fm801_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	{ 0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t fm801_driver = {
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 0445572ebd5ad..de76f28da77d6 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -31,6 +31,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * USB audio specs: http://www.usb.org/developers/devclass_docs/audio10.pdf
  *                  http://www.usb.org/developers/devclass_docs/frmts10.pdf
@@ -522,8 +525,8 @@ static device_method_t uaudio_methods[] = {
 	DEVMETHOD(device_suspend, bus_generic_suspend),
 	DEVMETHOD(device_resume, bus_generic_resume),
 	DEVMETHOD(device_shutdown, bus_generic_shutdown),
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-	{0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t uaudio_driver = {
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index 9491734eedd0c..43b4e7e8b380e 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -173,7 +173,6 @@ static device_method_t spibus_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	spibus_add_child),
 	DEVMETHOD(bus_print_child,	spibus_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_probe_nomatch,	spibus_probe_nomatch),
 	DEVMETHOD(bus_read_ivar,	spibus_read_ivar),
 	DEVMETHOD(bus_child_pnpinfo_str, spibus_child_pnpinfo_str),
@@ -183,7 +182,7 @@ static device_method_t spibus_methods[] = {
 	/* spibus interface */
 	DEVMETHOD(spibus_transfer,	spibus_transfer_impl),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t spibus_driver = {
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
index a6fc00bf9e00c..03e4eaaed4fb2 100644
--- a/sys/dev/ste/if_ste.c
+++ b/sys/dev/ste/if_ste.c
@@ -161,16 +161,12 @@ static device_method_t ste_methods[] = {
 	DEVMETHOD(device_suspend,	ste_suspend),
 	DEVMETHOD(device_resume,	ste_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	ste_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	ste_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	ste_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ste_driver = {
diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c
index b5ffc2ceafaf6..4ab97e4640546 100644
--- a/sys/dev/tl/if_tl.c
+++ b/sys/dev/tl/if_tl.c
@@ -348,16 +348,12 @@ static device_method_t tl_methods[] = {
 	DEVMETHOD(device_detach,	tl_detach),
 	DEVMETHOD(device_shutdown,	tl_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	tl_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	tl_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	tl_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t tl_driver = {
diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c
index b320a258359b4..55132eb96811a 100644
--- a/sys/dev/tsec/if_tsec_fdt.c
+++ b/sys/dev/tsec/if_tsec_fdt.c
@@ -88,15 +88,12 @@ static device_method_t tsec_methods[] = {
 	DEVMETHOD(device_suspend,	tsec_suspend),
 	DEVMETHOD(device_resume,	tsec_resume),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	tsec_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	tsec_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	tsec_miibus_statchg),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t tsec_fdt_driver = {
diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c
index 5651b7fc6e69a..0d018b68f8ab4 100644
--- a/sys/dev/twa/tw_osl_freebsd.c
+++ b/sys/dev/twa/tw_osl_freebsd.c
@@ -25,10 +25,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * AMCC'S 3ware driver for 9000 series storage controllers.
  *
@@ -195,9 +196,7 @@ static device_method_t	twa_methods[] = {
 	DEVMETHOD(device_detach,	twa_detach),
 	DEVMETHOD(device_shutdown,	twa_shutdown),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t	twa_pci_driver = {
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index a7b9c9141318c..29dab580d9dc1 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -25,10 +25,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * FreeBSD-specific code.
  */
@@ -135,9 +136,7 @@ static device_method_t twe_methods[] = {
     DEVMETHOD(device_suspend,	twe_suspend),
     DEVMETHOD(device_resume,	twe_resume),
 
-    DEVMETHOD(bus_print_child,	bus_generic_print_child),
-    DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t twe_pci_driver = {
diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c
index 750f878f9b5c6..02f78a51b4193 100644
--- a/sys/dev/tws/tws.c
+++ b/sys/dev/tws/tws.c
@@ -30,10 +30,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
-*/
+ */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <dev/tws/tws.h>
 #include <dev/tws/tws_services.h>
@@ -882,9 +882,7 @@ static device_method_t tws_methods[] = {
     DEVMETHOD(device_suspend,   tws_suspend),
     DEVMETHOD(device_resume,    tws_resume),
 
-    DEVMETHOD(bus_print_child,      bus_generic_print_child),
-    DEVMETHOD(bus_driver_added,     bus_generic_driver_added),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t tws_driver = {
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 49e9dad9a28f6..eda14c0136470 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -123,17 +123,13 @@ static device_method_t ubsec_methods[] = {
 	DEVMETHOD(device_resume,	ubsec_resume),
 	DEVMETHOD(device_shutdown,	ubsec_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* crypto device methods */
 	DEVMETHOD(cryptodev_newsession,	ubsec_newsession),
 	DEVMETHOD(cryptodev_freesession,ubsec_freesession),
 	DEVMETHOD(cryptodev_process,	ubsec_process),
 	DEVMETHOD(cryptodev_kprocess,	ubsec_kprocess),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t ubsec_driver = {
 	"ubsec",
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 = {
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index a14f2334eabac..fdee6b7232f79 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -254,15 +254,12 @@ static device_method_t aue_methods[] = {
 	DEVMETHOD(device_attach, aue_attach),
 	DEVMETHOD(device_detach, aue_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, aue_miibus_readreg),
 	DEVMETHOD(miibus_writereg, aue_miibus_writereg),
 	DEVMETHOD(miibus_statchg, aue_miibus_statchg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t aue_driver = {
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index 0d18f2bcda4ff..576639b4ed0ea 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -251,15 +251,12 @@ static device_method_t axe_methods[] = {
 	DEVMETHOD(device_attach, axe_attach),
 	DEVMETHOD(device_detach, axe_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, axe_miibus_readreg),
 	DEVMETHOD(miibus_writereg, axe_miibus_writereg),
 	DEVMETHOD(miibus_statchg, axe_miibus_statchg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t axe_driver = {
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 11cb962cb9cd2..7dd889efdaca7 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -220,15 +220,12 @@ static device_method_t mos_methods[] = {
 	DEVMETHOD(device_attach, mos_attach),
 	DEVMETHOD(device_detach, mos_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, mos_miibus_readreg),
 	DEVMETHOD(miibus_writereg, mos_miibus_writereg),
 	DEVMETHOD(miibus_statchg, mos_miibus_statchg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t mos_driver = {
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index e4fd035d73347..a870676503fc1 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -186,15 +186,12 @@ static device_method_t rue_methods[] = {
 	DEVMETHOD(device_attach, rue_attach),
 	DEVMETHOD(device_detach, rue_detach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, rue_miibus_readreg),
 	DEVMETHOD(miibus_writereg, rue_miibus_writereg),
 	DEVMETHOD(miibus_statchg, rue_miibus_statchg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t rue_driver = {
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 3fa3d150424f2..8160a3b5c3abe 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -145,15 +145,12 @@ static device_method_t udav_methods[] = {
 	DEVMETHOD(device_attach, udav_attach),
 	DEVMETHOD(device_detach, udav_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg, udav_miibus_readreg),
 	DEVMETHOD(miibus_writereg, udav_miibus_writereg),
 	DEVMETHOD(miibus_statchg, udav_miibus_statchg),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t udav_driver = {
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 1c1a99bb30d93..a49af277f53e2 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -212,15 +212,11 @@ static device_method_t vge_methods[] = {
 	DEVMETHOD(device_resume,	vge_resume),
 	DEVMETHOD(device_shutdown,	vge_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	vge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	vge_miibus_writereg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t vge_driver = {
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 0bcef0ed9d482..300296ff1c9f4 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -217,16 +217,12 @@ static device_method_t vr_methods[] = {
 	DEVMETHOD(device_suspend,	vr_suspend),
 	DEVMETHOD(device_resume,	vr_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	vr_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	vr_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	vr_miibus_statchg),
 
-	{ NULL, NULL }
+	DEVMETHOD_END
 };
 
 static driver_t vr_driver = {
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index daac0222154ce..9c5cd9512fa08 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -212,15 +212,12 @@ static device_method_t wb_methods[] = {
 	DEVMETHOD(device_detach,	wb_detach),
 	DEVMETHOD(device_shutdown,	wb_shutdown),
 
-	/* bus interface, for miibus */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	wb_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	wb_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	wb_miibus_statchg),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 static driver_t wb_driver = {
diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c
index e6c498bc27f59..cdc8f9c0568c3 100644
--- a/sys/dev/xen/pcifront/pcifront.c
+++ b/sys/dev/xen/pcifront/pcifront.c
@@ -516,14 +516,14 @@ static device_method_t xpcife_methods[] = {
 	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	bus_generic_resume),
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
     DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
     DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
     DEVMETHOD(bus_deactivate_resource,	bus_generic_deactivate_resource),
     DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
     DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-	{0, 0}
+
+	DEVMETHOD_END
 };
 
 static driver_t xpcife_driver = {
@@ -647,7 +647,7 @@ xpcib_route_interrupt(device_t pcib, device_t dev, int pin)
 
 static device_method_t xpcib_methods[] = {
     /* Device interface */
-    DEVMETHOD(device_probe,			xpcib_probe),
+    DEVMETHOD(device_probe,		xpcib_probe),
     DEVMETHOD(device_attach,		xpcib_attach),
     DEVMETHOD(device_detach,		bus_generic_detach),
     DEVMETHOD(device_shutdown,		bus_generic_shutdown),
@@ -655,7 +655,6 @@ static device_method_t xpcib_methods[] = {
     DEVMETHOD(device_resume,		bus_generic_resume),
 
     /* Bus interface */
-    DEVMETHOD(bus_print_child,		bus_generic_print_child),
     DEVMETHOD(bus_read_ivar,		xpcib_read_ivar),
     DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
     DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
@@ -669,7 +668,8 @@ static device_method_t xpcib_methods[] = {
     DEVMETHOD(pcib_read_config,		xpcib_read_config),
     DEVMETHOD(pcib_write_config,	xpcib_write_config),
     DEVMETHOD(pcib_route_interrupt,	xpcib_route_interrupt),
-    { 0, 0 }
+
+    DEVMETHOD_END
 };
 
 static devclass_t xpcib_devclass;
diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
index b774e7ff0b41e..7a913f4d5c3fe 100644
--- a/sys/dev/xl/if_xl.c
+++ b/sys/dev/xl/if_xl.c
@@ -310,17 +310,13 @@ static device_method_t xl_methods[] = {
 	DEVMETHOD(device_suspend,	xl_suspend),
 	DEVMETHOD(device_resume,	xl_resume),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	xl_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	xl_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	xl_miibus_statchg),
 	DEVMETHOD(miibus_mediainit,	xl_miibus_mediainit),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t xl_driver = {
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index 6fe57000433e0..b582b3fca1ad7 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -258,19 +258,17 @@ static device_method_t cpu_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	cpu_add_child),
 	DEVMETHOD(bus_read_ivar,	cpu_read_ivar),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
 	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
 	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cpu_driver = {
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 093e555f45730..bf7f9e009c419 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -294,8 +294,7 @@ static device_method_t isavga_methods[] = {
 	DEVMETHOD(device_suspend,	isavga_suspend),
 	DEVMETHOD(device_resume,	isavga_resume),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t isavga_driver = {
diff --git a/sys/mips/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
index 0ae7530191325..616d3bd683db2 100644
--- a/sys/mips/adm5120/admpci.c
+++ b/sys/mips/adm5120/admpci.c
@@ -473,7 +473,6 @@ static device_method_t admpci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	admpci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	admpci_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	admpci_alloc_resource),
@@ -489,7 +488,7 @@ static device_method_t admpci_methods[] = {
 	DEVMETHOD(pcib_write_config,	admpci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	admpci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t admpci_driver = {
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index 42c0157d48a9c..a2f616376b1d7 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -455,7 +455,6 @@ static device_method_t apb_methods[] = {
 	DEVMETHOD(bus_deactivate_resource,	apb_deactivate_resource),
 	DEVMETHOD(bus_get_resource_list,	apb_get_resource_list),
 	DEVMETHOD(bus_hinted_child,		apb_hinted_child),
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_release_resource,		apb_release_resource),
 	DEVMETHOD(bus_setup_intr,		apb_setup_intr),
 	DEVMETHOD(bus_teardown_intr,		apb_teardown_intr),
@@ -464,7 +463,7 @@ static device_method_t apb_methods[] = {
 	DEVMETHOD(bus_get_resource,		bus_generic_rl_get_resource),
 	DEVMETHOD(bus_set_resource,		bus_generic_rl_set_resource),
 
-	{0, 0},
+	DEVMETHOD_END
 };
 
 static driver_t apb_driver = {
diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c
index 9f5b894908f65..7d2c1cc14dea9 100644
--- a/sys/mips/atheros/ar71xx_ehci.c
+++ b/sys/mips/atheros/ar71xx_ehci.c
@@ -284,10 +284,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, ar71xx_ehci_resume),
 	DEVMETHOD(device_shutdown, ar71xx_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/mips/atheros/ar71xx_ohci.c b/sys/mips/atheros/ar71xx_ohci.c
index bee353ea38d3f..4ccd8c2a8f860 100644
--- a/sys/mips/atheros/ar71xx_ohci.c
+++ b/sys/mips/atheros/ar71xx_ohci.c
@@ -196,10 +196,7 @@ static device_method_t ohci_methods[] = {
 	DEVMETHOD(device_detach, ar71xx_ohci_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/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index 709d42e89f78a..a6c7c1bf881d7 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -538,7 +538,6 @@ static device_method_t ar71xx_pci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	ar71xx_pci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	ar71xx_pci_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	ar71xx_pci_alloc_resource),
@@ -554,7 +553,7 @@ static device_method_t ar71xx_pci_methods[] = {
 	DEVMETHOD(pcib_write_config,	ar71xx_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	ar71xx_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ar71xx_pci_driver = {
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index 36586a27f4950..59be9c0ad5ba2 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -573,7 +573,6 @@ static device_method_t ar724x_pci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	ar724x_pci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	ar724x_pci_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	ar724x_pci_alloc_resource),
@@ -589,7 +588,7 @@ static device_method_t ar724x_pci_methods[] = {
 	DEVMETHOD(pcib_write_config,	ar724x_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	ar724x_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ar724x_pci_driver = {
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index 567b9ba6f904e..be401239f58a3 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -155,16 +155,12 @@ static device_method_t arge_methods[] = {
 	DEVMETHOD(device_resume,	arge_resume),
 	DEVMETHOD(device_shutdown,	arge_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	arge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	arge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	arge_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t arge_driver = {
diff --git a/sys/mips/cavium/octopci.c b/sys/mips/cavium/octopci.c
index 8477321bb3713..392aed83004a6 100644
--- a/sys/mips/cavium/octopci.c
+++ b/sys/mips/cavium/octopci.c
@@ -962,7 +962,6 @@ static device_method_t octopci_methods[] = {
 
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	octopci_read_ivar),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	octopci_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource,octopci_activate_resource),
@@ -978,7 +977,7 @@ static device_method_t octopci_methods[] = {
 	DEVMETHOD(pcib_write_config,	octopci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	octopci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t octopci_driver = {
diff --git a/sys/mips/cavium/usb/octusb_octeon.c b/sys/mips/cavium/usb/octusb_octeon.c
index 8bebfda219c14..ac7b590638175 100644
--- a/sys/mips/cavium/usb/octusb_octeon.c
+++ b/sys/mips/cavium/usb/octusb_octeon.c
@@ -205,10 +205,7 @@ static device_method_t octusb_octeon_methods[] = {
 	DEVMETHOD(device_detach, octusb_octeon_detach),
 	DEVMETHOD(device_shutdown, octusb_octeon_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t octusb_octeon_driver = {
diff --git a/sys/mips/idt/idtpci.c b/sys/mips/idt/idtpci.c
index 2fce32dc58a41..7e003fd6feed8 100644
--- a/sys/mips/idt/idtpci.c
+++ b/sys/mips/idt/idtpci.c
@@ -528,7 +528,6 @@ static device_method_t idtpci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	idtpci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	idtpci_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	idtpci_alloc_resource),
@@ -544,7 +543,7 @@ static device_method_t idtpci_methods[] = {
 	DEVMETHOD(pcib_write_config,	idtpci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	idtpci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t idtpci_driver = {
diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c
index 243968dc297f7..b43defa257167 100644
--- a/sys/mips/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
@@ -118,16 +118,12 @@ static device_method_t kr_methods[] = {
 	DEVMETHOD(device_resume,	kr_resume),
 	DEVMETHOD(device_shutdown,	kr_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	kr_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	kr_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	kr_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t kr_driver = {
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index 257ac641652a2..ce320c98aa872 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -116,9 +116,8 @@ static device_method_t gt_methods[] = {
 	DEVMETHOD(bus_teardown_intr, gt_teardown_intr),
 	DEVMETHOD(bus_alloc_resource, gt_alloc_resource),
 	DEVMETHOD(bus_activate_resource, gt_activate_resource),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 
-	{0, 0},
+	DEVMETHOD_END
 };
 
 static driver_t gt_driver = {
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index aa28639fada1d..0e2012ee913d2 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -724,7 +724,6 @@ static device_method_t gt_pci_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	gt_read_ivar),
 	DEVMETHOD(bus_write_ivar,	gt_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	gt_pci_alloc_resource),
@@ -740,7 +739,7 @@ static device_method_t gt_pci_methods[] = {
 	DEVMETHOD(pcib_write_config,	gt_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	gt_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t gt_pci_driver = {
diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c
index bb98c80ebb457..4b0a333da8f64 100644
--- a/sys/mips/nlm/xlp_pci.c
+++ b/sys/mips/nlm/xlp_pci.c
@@ -634,7 +634,6 @@ static device_method_t xlp_pcib_methods[] = {
 	DEVMETHOD(device_attach, xlp_pcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar, xlp_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar, xlp_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource, xlp_pci_alloc_resource),
@@ -655,7 +654,7 @@ static device_method_t xlp_pcib_methods[] = {
 	DEVMETHOD(pcib_release_msi, xlp_release_msi),
 	DEVMETHOD(pcib_map_msi, xlp_map_msi),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xlp_pcib_driver = {
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 7b8845f7c7b51..a25ebe3c95e36 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -257,10 +257,8 @@ static device_method_t nlna_methods[] = {
 
 	/* bus interface : TBD : what are these for ? */
 	DEVMETHOD(bus_setup_intr,       bus_generic_setup_intr),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	nlna_driver = {
diff --git a/sys/mips/rmi/dev/sec/rmisec.c b/sys/mips/rmi/dev/sec/rmisec.c
index 5e00307c8e624..6501f75f88f75 100644
--- a/sys/mips/rmi/dev/sec/rmisec.c
+++ b/sys/mips/rmi/dev/sec/rmisec.c
@@ -76,16 +76,12 @@ static device_method_t xlr_sec_methods[] = {
 	DEVMETHOD(device_attach, xlr_sec_attach),
 	DEVMETHOD(device_detach, xlr_sec_detach),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-	DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
 	/* crypto device methods */
 	DEVMETHOD(cryptodev_newsession, xlr_sec_newsession),
 	DEVMETHOD(cryptodev_freesession,xlr_sec_freesession),
 	DEVMETHOD(cryptodev_process,    xlr_sec_process),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xlr_sec_driver = {
diff --git a/sys/mips/rmi/xlr_pci.c b/sys/mips/rmi/xlr_pci.c
index 29db1b667954f..feea696d9b356 100644
--- a/sys/mips/rmi/xlr_pci.c
+++ b/sys/mips/rmi/xlr_pci.c
@@ -627,7 +627,6 @@ static device_method_t xlr_pcib_methods[] = {
 	DEVMETHOD(device_attach, xlr_pcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar, xlr_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar, xlr_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource, xlr_pci_alloc_resource),
@@ -648,7 +647,7 @@ static device_method_t xlr_pcib_methods[] = {
 	DEVMETHOD(pcib_release_msi, xlr_release_msi),
 	DEVMETHOD(pcib_map_msi, xlr_map_msi),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t xlr_pcib_driver = {
diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c
index 5c7a53699774c..b0360f3118940 100644
--- a/sys/mips/rmi/xls_ehci.c
+++ b/sys/mips/rmi/xls_ehci.c
@@ -252,10 +252,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD(device_resume, ehci_xls_resume),
 	DEVMETHOD(device_shutdown, ehci_xls_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {
diff --git a/sys/mips/rt305x/rt305x_dotg.c b/sys/mips/rt305x/rt305x_dotg.c
index 32ebbfef255b3..144f3ade993d4 100644
--- a/sys/mips/rt305x/rt305x_dotg.c
+++ b/sys/mips/rt305x/rt305x_dotg.c
@@ -230,10 +230,7 @@ static device_method_t dotg_obio_methods[] = {
 	DEVMETHOD(device_detach, dotg_obio_detach),
 	DEVMETHOD(device_shutdown, dotg_obio_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t dotg_obio_driver = {
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 19b84d2063118..876461b07d947 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -239,16 +239,12 @@ static device_method_t rl_methods[] = {
 	DEVMETHOD(device_resume,	rl_resume),
 	DEVMETHOD(device_shutdown,	rl_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	rl_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	rl_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	rl_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t rl_driver = {
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 1cbe75df407e2..565b5a2547338 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -785,9 +785,6 @@ static device_method_t intsmb_methods[] = {
 	DEVMETHOD(device_attach,	intsmb_attach),
 	DEVMETHOD(device_detach,	intsmb_detach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-
 	/* SMBus interface */
 	DEVMETHOD(smbus_callback,	intsmb_callback),
 	DEVMETHOD(smbus_quick,		intsmb_quick),
@@ -801,7 +798,7 @@ static device_method_t intsmb_methods[] = {
 	DEVMETHOD(smbus_bwrite,		intsmb_bwrite),
 	DEVMETHOD(smbus_bread,		intsmb_bread),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t intsmb_driver = {
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index 66dd3b5d60eb2..0cddd07f0d799 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -954,7 +954,6 @@ static device_method_t viapm_methods[] = {
 	DEVMETHOD(iicbb_reset,		viabb_reset),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -962,7 +961,7 @@ static device_method_t viapm_methods[] = {
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t viapm_driver = {
@@ -990,7 +989,6 @@ static device_method_t viapropm_methods[] = {
 	DEVMETHOD(smbus_bread,		viasmb_bread),
 	
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -998,7 +996,7 @@ static device_method_t viapropm_methods[] = {
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t viapropm_driver = {
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c
index 4da4e9fc2436e..9a6bf470b8e53 100644
--- a/sys/powerpc/aim/nexus.c
+++ b/sys/powerpc/aim/nexus.c
@@ -51,10 +51,11 @@
  * SUCH DAMAGE.
  *
  * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -162,7 +163,6 @@ static device_method_t nexus_methods[] = {
 
 	/* Bus interface. Resource management is business of the children... */
 	DEVMETHOD(bus_add_child,	nexus_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
 	DEVMETHOD(bus_probe_nomatch,	nexus_probe_nomatch),
 	DEVMETHOD(bus_read_ivar,	nexus_read_ivar),
@@ -184,7 +184,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(ofw_bus_get_type, nexus_ofw_get_type),
 	DEVMETHOD(ofw_bus_get_compat, nexus_ofw_get_compat),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nexus_driver = {
diff --git a/sys/powerpc/mambo/mambo.c b/sys/powerpc/mambo/mambo.c
index a3cab89a35a5d..aa1b9a47b8ca9 100644
--- a/sys/powerpc/mambo/mambo.c
+++ b/sys/powerpc/mambo/mambo.c
@@ -56,9 +56,7 @@ static device_method_t  mambobus_methods[] = {
 	DEVMETHOD(device_attach,	mambobus_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	bus_generic_read_ivar),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -66,7 +64,7 @@ static device_method_t  mambobus_methods[] = {
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource,bus_generic_activate_resource),
 
-	{0,0}
+	DEVMETHOD_END
 };
 
 static driver_t mambobus_driver = {
diff --git a/sys/powerpc/mpc85xx/nexus.c b/sys/powerpc/mpc85xx/nexus.c
index 06e60ab3cf12e..b0fff6a6499a0 100644
--- a/sys/powerpc/mpc85xx/nexus.c
+++ b/sys/powerpc/mpc85xx/nexus.c
@@ -86,7 +86,6 @@ static device_method_t nexus_methods[] = {
 
 	/* Bus interface. Resource management is business of the children... */
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_probe_nomatch,	NULL),
 	DEVMETHOD(bus_read_ivar,	NULL),
 	DEVMETHOD(bus_write_ivar,	NULL),
@@ -97,7 +96,7 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
 	DEVMETHOD(bus_release_resource,	NULL),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nexus_driver = {
diff --git a/sys/powerpc/mpc85xx/pci_fdt.c b/sys/powerpc/mpc85xx/pci_fdt.c
index 11837c3f3c663..994edbf8a6caf 100644
--- a/sys/powerpc/mpc85xx/pci_fdt.c
+++ b/sys/powerpc/mpc85xx/pci_fdt.c
@@ -174,7 +174,6 @@ static device_method_t fsl_pcib_methods[] = {
 	DEVMETHOD(device_detach,	fsl_pcib_detach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	fsl_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,	fsl_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	fsl_pcib_alloc_resource),
@@ -197,7 +196,7 @@ static device_method_t fsl_pcib_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,     ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,     ofw_bus_gen_get_type),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fsl_pcib_driver = {
diff --git a/sys/powerpc/ofw/ofw_cpu.c b/sys/powerpc/ofw/ofw_cpu.c
index 846556e130177..b50e3141eca12 100644
--- a/sys/powerpc/ofw/ofw_cpu.c
+++ b/sys/powerpc/ofw/ofw_cpu.c
@@ -21,10 +21,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -51,9 +52,7 @@ static device_method_t ofw_cpulist_methods[] = {
 	DEVMETHOD(device_attach,	ofw_cpulist_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
 
 	/* ofw_bus interface */
@@ -64,7 +63,7 @@ static device_method_t ofw_cpulist_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ofw_cpulist_driver = {
@@ -140,9 +139,7 @@ static device_method_t ofw_cpu_methods[] = {
 	DEVMETHOD(device_attach,	ofw_cpu_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	ofw_cpu_read_ivar),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -150,7 +147,7 @@ static device_method_t ofw_cpu_methods[] = {
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource,bus_generic_activate_resource),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ofw_cpu_driver = {
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index 22554df8a4be7..5ecddb3b20cd4 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -23,10 +23,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/bus.h>
@@ -61,7 +62,6 @@ static device_method_t ofw_pcib_pci_methods[] = {
 	DEVMETHOD(device_resume,		bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,		pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	pcib_alloc_resource),
@@ -83,9 +83,9 @@ static device_method_t ofw_pcib_pci_methods[] = {
 	DEVMETHOD(pcib_map_msi,		pcib_map_msi),
 
 	/* ofw_bus interface */
-	DEVMETHOD(ofw_bus_get_node,     ofw_pcib_pci_get_node),
+	DEVMETHOD(ofw_bus_get_node,	ofw_pcib_pci_get_node),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static devclass_t pcib_devclass;
@@ -101,7 +101,6 @@ struct ofw_pcib_softc {
         struct ofw_bus_iinfo    ops_iinfo;
 };
 
-
 DEFINE_CLASS_0(pcib, ofw_pcib_pci_driver, ofw_pcib_pci_methods,
     sizeof(struct ofw_pcib_softc));
 DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, pcib_devclass, 0, 0);
diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c
index 0064d77d02c08..48a73eea8ad89 100644
--- a/sys/powerpc/powermac/cpcht.c
+++ b/sys/powerpc/powermac/cpcht.c
@@ -21,10 +21,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -115,7 +116,6 @@ static device_method_t	cpcht_methods[] = {
 	DEVMETHOD(device_attach,	cpcht_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	cpcht_read_ivar),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -137,7 +137,8 @@ static device_method_t	cpcht_methods[] = {
 
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,     cpcht_get_node),
-	{ 0, 0 }
+
+	DEVMETHOD_END
 };
 
 struct cpcht_irq {
diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c
index 99a0ea9c46156..362a3fe713b1f 100644
--- a/sys/powerpc/powermac/cuda.c
+++ b/sys/powerpc/powermac/cuda.c
@@ -90,10 +90,6 @@ static device_method_t  cuda_methods[] = {
         DEVMETHOD(device_suspend,       bus_generic_suspend),
         DEVMETHOD(device_resume,        bus_generic_resume),
 
-	/* bus interface, for ADB root */
-        DEVMETHOD(bus_print_child,      bus_generic_print_child),
-        DEVMETHOD(bus_driver_added,     bus_generic_driver_added),
-
 	/* ADB bus interface */
 	DEVMETHOD(adb_hb_send_raw_packet,	cuda_adb_send),
 	DEVMETHOD(adb_hb_controller_poll,	cuda_poll),
@@ -103,7 +99,7 @@ static device_method_t  cuda_methods[] = {
 	DEVMETHOD(clock_gettime,	cuda_gettime),
 	DEVMETHOD(clock_settime,	cuda_settime),
 
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t cuda_driver = {
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index d62891412fec3..55610cf87eae3 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -23,10 +23,11 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -113,7 +114,6 @@ static device_method_t	grackle_methods[] = {
 	DEVMETHOD(device_attach,	grackle_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	grackle_read_ivar),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -131,7 +131,7 @@ static device_method_t	grackle_methods[] = {
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,     grackle_get_node),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	grackle_driver = {
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
index d641c9c74f5a2..c478179da52bc 100644
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -118,10 +118,6 @@ static device_method_t  pmu_methods[] = {
         DEVMETHOD(device_suspend,       bus_generic_suspend),
         DEVMETHOD(device_resume,        bus_generic_resume),
 
-	/* bus interface, for ADB root */
-        DEVMETHOD(bus_print_child,      bus_generic_print_child),
-        DEVMETHOD(bus_driver_added,     bus_generic_driver_added),
-
 	/* ADB bus interface */
 	DEVMETHOD(adb_hb_send_raw_packet,   pmu_adb_send),
 	DEVMETHOD(adb_hb_controller_poll,   pmu_poll),
@@ -131,7 +127,7 @@ static device_method_t  pmu_methods[] = {
 	DEVMETHOD(clock_gettime,	pmu_gettime),
 	DEVMETHOD(clock_settime,	pmu_settime),
 
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t pmu_driver = {
diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c
index afca08174ef35..2add0489036c1 100644
--- a/sys/powerpc/powermac/uninorthpci.c
+++ b/sys/powerpc/powermac/uninorthpci.c
@@ -21,10 +21,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
@@ -105,7 +106,6 @@ static device_method_t	uninorth_methods[] = {
 	DEVMETHOD(device_attach,	uninorth_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	uninorth_read_ivar),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -121,7 +121,7 @@ static device_method_t	uninorth_methods[] = {
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,     uninorth_get_node),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	uninorth_driver = {
diff --git a/sys/powerpc/ps3/ehci_ps3.c b/sys/powerpc/ps3/ehci_ps3.c
index 317a54bf1e054..c85c9bb4d1a20 100644
--- a/sys/powerpc/ps3/ehci_ps3.c
+++ b/sys/powerpc/ps3/ehci_ps3.c
@@ -153,10 +153,7 @@ static device_method_t ehci_ps3_methods[] = {
 	DEVMETHOD(device_probe, ehci_ps3_probe),
 	DEVMETHOD(device_attach, ehci_ps3_attach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_ps3_driver = {
@@ -169,4 +166,3 @@ static devclass_t ehci_ps3_devclass;
 
 DRIVER_MODULE(ehci_ps3, ps3bus, ehci_ps3_driver, ehci_ps3_devclass, 0, 0);
 MODULE_DEPEND(ehci_ps3, usb, 1, 1, 1);
-
diff --git a/sys/powerpc/ps3/ohci_ps3.c b/sys/powerpc/ps3/ohci_ps3.c
index e13435b7ba9e7..c16daba133359 100644
--- a/sys/powerpc/ps3/ohci_ps3.c
+++ b/sys/powerpc/ps3/ohci_ps3.c
@@ -151,10 +151,7 @@ static device_method_t ohci_ps3_methods[] = {
 	DEVMETHOD(device_probe, ohci_ps3_probe),
 	DEVMETHOD(device_attach, ohci_ps3_attach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ohci_ps3_driver = {
diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c
index 90f0e87cc9f42..4c6ed76b18461 100644
--- a/sys/powerpc/ps3/ps3bus.c
+++ b/sys/powerpc/ps3/ps3bus.c
@@ -22,10 +22,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -104,7 +105,6 @@ static device_method_t ps3bus_methods[] = {
 	DEVMETHOD(device_attach,	ps3bus_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_add_child,	bus_generic_add_child),
 	DEVMETHOD(bus_get_dma_tag,	ps3bus_get_dma_tag),
 	DEVMETHOD(bus_print_child,	ps3bus_print_child),
@@ -122,7 +122,7 @@ static device_method_t ps3bus_methods[] = {
 	DEVMETHOD(clock_gettime,	ps3_gettime),
 	DEVMETHOD(clock_settime,	ps3_settime),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 struct ps3bus_softc {
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c
index 5a1e08af6fa0e..0dbe536781578 100644
--- a/sys/sparc64/pci/fire.c
+++ b/sys/sparc64/pci/fire.c
@@ -140,7 +140,6 @@ static device_method_t fire_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	fire_read_ivar),
 	DEVMETHOD(bus_setup_intr,	fire_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	fire_teardown_intr),
@@ -165,7 +164,7 @@ static device_method_t fire_methods[] = {
 	/* ofw_bus interface */
 	DEVMETHOD(ofw_bus_get_node,	fire_get_node),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t fire_devclass;
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index f7b5d4a31146c..0ebbb408352d0 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -130,7 +130,6 @@ static device_method_t psycho_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	psycho_read_ivar),
 	DEVMETHOD(bus_setup_intr,	psycho_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -139,7 +138,6 @@ static device_method_t psycho_methods[] = {
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 	DEVMETHOD(bus_adjust_resource,	psycho_adjust_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
-	DEVMETHOD(bus_describe_intr,	bus_generic_describe_intr),
 	DEVMETHOD(bus_get_dma_tag,	psycho_get_dma_tag),
 
 	/* pcib interface */
@@ -154,7 +152,7 @@ static device_method_t psycho_methods[] = {
 	/* ofw_pci interface */
 	DEVMETHOD(ofw_pci_setup_device,	psycho_setup_device),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t psycho_devclass;
diff --git a/sys/sparc64/pci/sbbc.c b/sys/sparc64/pci/sbbc.c
index 812b350ea89c0..491f653c2275b 100644
--- a/sys/sparc64/pci/sbbc.c
+++ b/sys/sparc64/pci/sbbc.c
@@ -279,7 +279,6 @@ static device_method_t sbbc_pci_methods[] = {
 	DEVMETHOD(device_probe,		sbbc_pci_probe),
 	DEVMETHOD(device_attach,	sbbc_pci_attach),
 
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,	sbbc_bus_alloc_resource),
 	DEVMETHOD(bus_activate_resource,sbbc_bus_activate_resource),
 	DEVMETHOD(bus_deactivate_resource,sbbc_bus_deactivate_resource),
@@ -294,7 +293,7 @@ static device_method_t sbbc_pci_methods[] = {
 	DEVMETHOD(clock_gettime,	sbbc_tod_gettime),
 	DEVMETHOD(clock_settime,	sbbc_tod_settime),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t sbbc_devclass;
@@ -605,7 +604,7 @@ static device_method_t sbbc_uart_sbbc_methods[] = {
 	DEVMETHOD(device_attach,	uart_bus_attach),
 	DEVMETHOD(device_detach,	uart_bus_detach),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(uart, sbbc_uart_driver, sbbc_uart_sbbc_methods,
@@ -806,7 +805,7 @@ static kobj_method_t sbbc_uart_methods[] = {
 	KOBJMETHOD(uart_setsig,		sbbc_uart_bus_setsig),
 	KOBJMETHOD(uart_transmit,	sbbc_uart_bus_transmit),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 struct uart_class uart_sbbc_class = {
diff --git a/sys/sparc64/pci/schizo.c b/sys/sparc64/pci/schizo.c
index b0e7545125153..9a27043acdeec 100644
--- a/sys/sparc64/pci/schizo.c
+++ b/sys/sparc64/pci/schizo.c
@@ -130,7 +130,6 @@ static device_method_t schizo_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	schizo_read_ivar),
 	DEVMETHOD(bus_setup_intr,	schizo_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
@@ -153,7 +152,7 @@ static device_method_t schizo_methods[] = {
 	/* ofw_pci interface */
 	DEVMETHOD(ofw_pci_setup_device,	schizo_setup_device),
 
-	KOBJMETHOD_END
+	DEVMETHOD_END
 };
 
 static devclass_t schizo_devclass;
diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c
index 0efac6e366a6f..995e714312058 100644
--- a/sys/x86/pci/pci_bus.c
+++ b/sys/x86/pci/pci_bus.c
@@ -597,7 +597,6 @@ static device_method_t legacy_pcib_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	legacy_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,	legacy_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	legacy_pcib_alloc_resource),
@@ -619,7 +618,7 @@ static device_method_t legacy_pcib_methods[] = {
 	DEVMETHOD(pcib_release_msix,	pcib_release_msix),
 	DEVMETHOD(pcib_map_msi,		legacy_pcib_map_msi),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t hostb_devclass;
diff --git a/sys/x86/pci/qpi.c b/sys/x86/pci/qpi.c
index d14494ca1bbf5..08a95f523530f 100644
--- a/sys/x86/pci/qpi.c
+++ b/sys/x86/pci/qpi.c
@@ -292,7 +292,6 @@ static device_method_t qpi_pcib_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	qpi_pcib_read_ivar),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
@@ -311,7 +310,7 @@ static device_method_t qpi_pcib_methods[] = {
 	DEVMETHOD(pcib_release_msix,	pcib_release_msix),
 	DEVMETHOD(pcib_map_msi,		qpi_pcib_map_msi),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static devclass_t qpi_pcib_devclass;
diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c
index f0b90a80c3ac4..985cfa7deb9ae 100644
--- a/sys/x86/x86/mptable_pci.c
+++ b/sys/x86/x86/mptable_pci.c
@@ -190,7 +190,6 @@ static device_method_t mptable_hostb_methods[] = {
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	legacy_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,	legacy_pcib_write_ivar),
 #ifdef NEW_PCIB
@@ -217,7 +216,7 @@ static device_method_t mptable_hostb_methods[] = {
 	DEVMETHOD(pcib_release_msix,	pcib_release_msix),
 	DEVMETHOD(pcib_map_msi,		mptable_hostb_map_msi),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t hostb_devclass;
diff --git a/sys/xen/xenstore/xenstore.c b/sys/xen/xenstore/xenstore.c
index 658e6e38ea03c..284bad3aeb709 100644
--- a/sys/xen/xenstore/xenstore.c
+++ b/sys/xen/xenstore/xenstore.c
@@ -1252,13 +1252,12 @@ static device_method_t xenstore_methods[] = {
  
 	/* Bus interface */ 
 	DEVMETHOD(bus_add_child,        bus_generic_add_child),
-	DEVMETHOD(bus_print_child,      bus_generic_print_child),
 	DEVMETHOD(bus_alloc_resource,   bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource, bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- 
-	{ 0, 0 } 
+
+	DEVMETHOD_END
 }; 
 
 DEFINE_CLASS_0(xenstore, xenstore_driver, xenstore_methods, 0);