chore: replace {0, 0} with {DEV,KOBJ}METHOD_END

Both of the aforementioned macros have been present in FreeBSD
for well over a decade: 2009 for `KOBJMETHOD_END`; 2011 for
`DEVMETHOD_END`.

Adapt all hardcoded references of `{0, 0}` with `DEVMETHOD_END`
and `KOBJMETHOD_END` as appropriate. This helps ensure that
future adaptations to drivers following patterns documented
in driver(9) can be made more easily/without issue.

MFC after:	1 week
Differential Revision:	 https://reviews.freebsd.org/D55414

186 files changed, 208 insertions, 207 deletions

diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c
index 919bf1ad55ca..6cb515462f08 100644
--- a/sys/dev/aacraid/aacraid_cam.c
+++ b/sys/dev/aacraid/aacraid_cam.c
@@ -122,7 +122,7 @@ static device_method_t	aacraid_pass_methods[] = {
 	DEVMETHOD(device_probe,		aac_cam_probe),
 	DEVMETHOD(device_attach,	aac_cam_attach),
 	DEVMETHOD(device_detach,	aac_cam_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	aacraid_pass_driver = {
diff --git a/sys/dev/aacraid/aacraid_pci.c b/sys/dev/aacraid/aacraid_pci.c
index cb4c6fb8eeba..37bcede44878 100644
--- a/sys/dev/aacraid/aacraid_pci.c
+++ b/sys/dev/aacraid/aacraid_pci.c
@@ -72,7 +72,7 @@ static device_method_t aacraid_methods[] = {
 
 	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t aacraid_pci_driver = {
diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c
index b9ba6650d2b7..975d7f93554a 100644
--- a/sys/dev/acpi_support/acpi_asus.c
+++ b/sys/dev/acpi_support/acpi_asus.c
@@ -517,7 +517,7 @@ static device_method_t acpi_asus_methods[] = {
 	DEVMETHOD(device_probe,  acpi_asus_probe),
 	DEVMETHOD(device_attach, acpi_asus_attach),
 	DEVMETHOD(device_detach, acpi_asus_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t acpi_asus_driver = {
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index 7a22c9dc0994..f949e14f58e6 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -176,7 +176,7 @@ static device_method_t acpi_video_methods[] = {
 	DEVMETHOD(device_detach, acpi_video_detach),
 	DEVMETHOD(device_resume, acpi_video_resume),
 	DEVMETHOD(device_shutdown, acpi_video_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t acpi_video_driver = {
diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c
index 7f4bd8676fcf..52d38caf7a24 100644
--- a/sys/dev/adb/adb_bus.c
+++ b/sys/dev/adb/adb_bus.c
@@ -57,15 +57,15 @@ static device_method_t adb_bus_methods[] = {
 	DEVMETHOD(device_probe,		adb_bus_probe),
 	DEVMETHOD(device_attach,	adb_bus_attach),
 	DEVMETHOD(device_detach,        bus_generic_detach),
-        DEVMETHOD(device_shutdown,      bus_generic_shutdown),
-        DEVMETHOD(device_suspend,       bus_generic_suspend),
-        DEVMETHOD(device_resume,        bus_generic_resume),
+	DEVMETHOD(device_shutdown,      bus_generic_shutdown),
+	DEVMETHOD(device_suspend,       bus_generic_suspend),
+	DEVMETHOD(device_resume,        bus_generic_resume),
 
 	/* Bus Interface */
-        DEVMETHOD(bus_probe_nomatch,    adb_probe_nomatch),
-        DEVMETHOD(bus_print_child,	adb_print_child),
+	DEVMETHOD(bus_probe_nomatch,    adb_probe_nomatch),
+	DEVMETHOD(bus_print_child,	adb_print_child),
 
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 driver_t adb_driver = {
diff --git a/sys/dev/adb/adb_buttons.c b/sys/dev/adb/adb_buttons.c
index e003183f9e9d..14d96cc5a05c 100644
--- a/sys/dev/adb/adb_buttons.c
+++ b/sys/dev/adb/adb_buttons.c
@@ -67,7 +67,7 @@ static device_method_t abtn_methods[] = {
 
 	/* ADB interface */
 	DEVMETHOD(adb_receive_packet,	abtn_receive_packet),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t abtn_driver = {
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index f1b8d3589be9..ce81da855efc 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -99,7 +99,7 @@ static device_method_t adb_kbd_methods[] = {
 
 	/* ADB interface */
 	DEVMETHOD(adb_receive_packet,	adb_kbd_receive_packet),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t adb_kbd_driver = {
diff --git a/sys/dev/adb/adb_mouse.c b/sys/dev/adb/adb_mouse.c
index e89612abddb2..92fc512efb45 100644
--- a/sys/dev/adb/adb_mouse.c
+++ b/sys/dev/adb/adb_mouse.c
@@ -104,7 +104,7 @@ static device_method_t adb_mouse_methods[] = {
 
 	/* ADB interface */
 	DEVMETHOD(adb_receive_packet,	adb_mouse_receive_packet),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t adb_mouse_driver = {
diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index d0301f3a5c7e..b6dc2d34ddd4 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -253,7 +253,7 @@ static device_method_t agp_ali_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_ali_driver = {
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index e7f1deed188d..368ea7e4de7d 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -390,7 +390,7 @@ static device_method_t agp_amd_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_amd_driver = {
diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_amd64.c
index ff36200bd299..287e6fb7218c 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -498,7 +498,7 @@ static device_method_t agp_amd64_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_amd64_driver = {
diff --git a/sys/dev/agp/agp_apple.c b/sys/dev/agp/agp_apple.c
index 48938044a5d6..d2a94cd654f7 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -278,7 +278,7 @@ static device_method_t agp_apple_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_apple_driver = {
diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c
index a383acdb89dc..667be51f48e8 100644
--- a/sys/dev/agp/agp_ati.c
+++ b/sys/dev/agp/agp_ati.c
@@ -362,7 +362,7 @@ static device_method_t agp_ati_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_ati_driver = {
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 371eac691916..fa98d6f56a3a 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -1913,7 +1913,7 @@ static device_method_t agp_i810_methods[] = {
 	DEVMETHOD(agp_bind_memory,	agp_i810_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_i810_unbind_memory),
 	DEVMETHOD(agp_chipset_flush,	agp_intel_gtt_chipset_flush),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_i810_driver = {
diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index d8abd759dec6..0fec1f8a5201 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -419,7 +419,7 @@ static device_method_t agp_intel_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_intel_driver = {
diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c
index fa5b73023f59..8a24063f9d90 100644
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -435,7 +435,7 @@ static device_method_t agp_nvidia_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_nvidia_driver = {
diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index 3df1ca19f478..daea60c5f30f 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -273,7 +273,7 @@ static device_method_t agp_sis_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_sis_driver = {
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index 3948f1a96697..9d0871ae9b21 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -408,7 +408,7 @@ static device_method_t agp_via_methods[] = {
 	DEVMETHOD(agp_free_memory,	agp_generic_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_generic_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_generic_unbind_memory),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t agp_via_driver = {
diff --git a/sys/dev/aic7xxx/ahc_isa.c b/sys/dev/aic7xxx/ahc_isa.c
index e096a9e5bb6d..37308b9dac6c 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -285,7 +285,7 @@ static device_method_t ahc_isa_device_methods[] = {
 	DEVMETHOD(device_probe,		ahc_isa_probe),
 	DEVMETHOD(device_attach,	ahc_isa_attach),
 	DEVMETHOD(device_detach,	ahc_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ahc_isa_driver = {
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 7f8fbe140237..4c3cbc6a2422 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -41,7 +41,7 @@ static device_method_t ahc_pci_device_methods[] = {
 	DEVMETHOD(device_probe,		ahc_pci_probe),
 	DEVMETHOD(device_attach,	ahc_pci_attach),
 	DEVMETHOD(device_detach,	ahc_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ahc_pci_driver = {
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 6af7169b49ff..f53563e4ba40 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -41,7 +41,7 @@ static device_method_t ahd_pci_device_methods[] = {
 	DEVMETHOD(device_probe,		ahd_pci_probe),
 	DEVMETHOD(device_attach,	ahd_pci_attach),
 	DEVMETHOD(device_detach,	ahd_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ahd_pci_driver = {
diff --git a/sys/dev/al_eth/al_eth.c b/sys/dev/al_eth/al_eth.c
index f4fec7c6aa94..47d31c264f67 100644
--- a/sys/dev/al_eth/al_eth.c
+++ b/sys/dev/al_eth/al_eth.c
@@ -242,7 +242,7 @@ static device_method_t al_methods[] = {
 	DEVMETHOD(miibus_writereg,	al_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	al_miibus_statchg),
 	DEVMETHOD(miibus_linkchg,	al_miibus_linkchg),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t al_driver = {
diff --git a/sys/dev/alpm/alpm.c b/sys/dev/alpm/alpm.c
index d7c3d3657d3b..2bf74c276a5f 100644
--- a/sys/dev/alpm/alpm.c
+++ b/sys/dev/alpm/alpm.c
@@ -642,7 +642,7 @@ static device_method_t alpm_methods[] = {
 	DEVMETHOD(smbus_readw,		alpm_readw),
 	DEVMETHOD(smbus_bwrite,		alpm_bwrite),
 	DEVMETHOD(smbus_bread,		alpm_bread),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t alpm_driver = {
diff --git a/sys/dev/amdpm/amdpm.c b/sys/dev/amdpm/amdpm.c
index d744c0aa5d4b..f93cc5b2eaa7 100644
--- a/sys/dev/amdpm/amdpm.c
+++ b/sys/dev/amdpm/amdpm.c
@@ -648,7 +648,7 @@ static device_method_t amdpm_methods[] = {
 	DEVMETHOD(smbus_readw,		amdpm_readw),
 	DEVMETHOD(smbus_bwrite,		amdpm_bwrite),
 	DEVMETHOD(smbus_bread,		amdpm_bread),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t amdpm_driver = {
diff --git a/sys/dev/amdsmb/amdsmb.c b/sys/dev/amdsmb/amdsmb.c
index 3d2e7a5e0c19..65992dc34b02 100644
--- a/sys/dev/amdsmb/amdsmb.c
+++ b/sys/dev/amdsmb/amdsmb.c
@@ -560,7 +560,7 @@ static device_method_t amdsmb_methods[] = {
 	DEVMETHOD(smbus_readw,		amdsmb_readw),
 	DEVMETHOD(smbus_bwrite,		amdsmb_bwrite),
 	DEVMETHOD(smbus_bread,		amdsmb_bread),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t amdsmb_driver = {
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index 084b57331dd9..dd7ad7d5e66d 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -534,7 +534,7 @@ static device_method_t	asmc_methods[] = {
 	DEVMETHOD(device_attach,	asmc_attach),
 	DEVMETHOD(device_detach,	asmc_detach),
 	DEVMETHOD(device_resume,	asmc_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	asmc_driver = {
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index d5ef9706d7b9..64545ce63ba9 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -61,7 +61,7 @@ static device_method_t atkbd_methods[] = {
 	DEVMETHOD(device_probe,		atkbdprobe),
 	DEVMETHOD(device_attach,	atkbdattach),
 	DEVMETHOD(device_resume,	atkbdresume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t atkbd_driver = {
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 062c5fc491e8..fe8bbf0c8d75 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -75,7 +75,7 @@ static device_method_t atkbdc_isa_methods[] = {
 	DEVMETHOD(bus_delete_resource,	bus_generic_rl_delete_resource),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t atkbdc_isa_driver = {
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 95acf43a3bc6..a2fc68d0f52a 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -745,7 +745,7 @@ static device_method_t psm_methods[] = {
 	DEVMETHOD(device_attach,	psmattach),
 	DEVMETHOD(device_detach,	psmdetach),
 	DEVMETHOD(device_resume,	psmresume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t psm_driver = {
@@ -7543,7 +7543,7 @@ static	device_attach_t			psmcpnp_attach;
 static device_method_t psmcpnp_methods[] = {
 	DEVMETHOD(device_probe,		psmcpnp_probe),
 	DEVMETHOD(device_attach,	psmcpnp_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t psmcpnp_driver = {
diff --git a/sys/dev/axgbe/if_axgbe.c b/sys/dev/axgbe/if_axgbe.c
index b35beca9c886..9a6b2a95d6b2 100644
--- a/sys/dev/axgbe/if_axgbe.c
+++ b/sys/dev/axgbe/if_axgbe.c
@@ -559,7 +559,7 @@ static device_method_t axgbe_methods[] = {
 	DEVMETHOD(device_probe,		axgbe_probe),
 	DEVMETHOD(device_attach,	axgbe_attach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(axgbe, axgbe_driver, axgbe_methods,
@@ -602,7 +602,7 @@ static device_method_t axgbephy_methods[] = {
 	DEVMETHOD(device_probe,		axgbephy_probe),
 	DEVMETHOD(device_attach,	axgbephy_attach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(axgbephy, axgbephy_driver, axgbephy_methods, 0);
diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c
index 78c5f149ba7d..223178e36e47 100644
--- a/sys/dev/cfe/cfe_resource.c
+++ b/sys/dev/cfe/cfe_resource.c
@@ -144,7 +144,7 @@ static device_method_t cferes_methods[] = {
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	bus_generic_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cferes_driver = {
diff --git a/sys/dev/cfi/cfi_disk.c b/sys/dev/cfi/cfi_disk.c
index 4c3eae473fb6..3beef8821ae4 100644
--- a/sys/dev/cfi/cfi_disk.c
+++ b/sys/dev/cfi/cfi_disk.c
@@ -346,7 +346,7 @@ static device_method_t cfi_disk_methods[] = {
 	DEVMETHOD(device_probe,		cfi_disk_probe),
 	DEVMETHOD(device_attach,	cfi_disk_attach),
 	DEVMETHOD(device_detach,	cfi_disk_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t cfi_disk_driver = {
 	"cfid",
diff --git a/sys/dev/chromebook_platform/chromebook_platform.c b/sys/dev/chromebook_platform/chromebook_platform.c
index f873338a3ba6..c7c1ff4222a1 100644
--- a/sys/dev/chromebook_platform/chromebook_platform.c
+++ b/sys/dev/chromebook_platform/chromebook_platform.c
@@ -82,7 +82,7 @@ chromebook_i2c_identify(driver_t *driver, device_t bus)
 
 static device_method_t chromebook_i2c_methods[] = {
 	DEVMETHOD(device_identify,	chromebook_i2c_identify),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t chromebook_i2c_driver = {
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index dd3df631119a..416f6e86e663 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -217,7 +217,7 @@ static device_method_t ciss_methods[] = {
     DEVMETHOD(device_attach,	ciss_attach),
     DEVMETHOD(device_detach,	ciss_detach),
     DEVMETHOD(device_shutdown,	ciss_shutdown),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t ciss_pci_driver = {
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 616a2ecc1a37..81fd3cb45841 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -187,7 +187,7 @@ static device_method_t cxgb_port_methods[] = {
 	DEVMETHOD(device_probe,		cxgb_port_probe),
 	DEVMETHOD(device_attach,	cxgb_port_attach),
 	DEVMETHOD(device_detach,	cxgb_port_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cxgb_port_driver = {
diff --git a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
index 9cdfd0fb9652..d90d7904a8ae 100644
--- a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
@@ -164,7 +164,7 @@ static kobj_method_t icl_cxgbei_methods[] = {
 	KOBJMETHOD(icl_conn_task_done, icl_cxgbei_conn_task_done),
 	KOBJMETHOD(icl_conn_transfer_setup, icl_cxgbei_conn_transfer_setup),
 	KOBJMETHOD(icl_conn_transfer_done, icl_cxgbei_conn_transfer_done),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 DEFINE_CLASS(icl_cxgbei, icl_cxgbei_methods, sizeof(struct icl_cxgbei_conn));
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index ecbe4d997278..cb0ad2342e7c 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -128,7 +128,7 @@ device_method_t cxgbe_methods[] = {
 	DEVMETHOD(device_probe,		cxgbe_probe),
 	DEVMETHOD(device_attach,	cxgbe_attach),
 	DEVMETHOD(device_detach,	cxgbe_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t cxgbe_driver = {
 	"cxgbe",
@@ -144,7 +144,7 @@ static device_method_t vcxgbe_methods[] = {
 	DEVMETHOD(device_probe,		vcxgbe_probe),
 	DEVMETHOD(device_attach,	vcxgbe_attach),
 	DEVMETHOD(device_detach,	vcxgbe_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t vcxgbe_driver = {
 	"vcxgbe",
diff --git a/sys/dev/dcons/dcons_crom.c b/sys/dev/dcons/dcons_crom.c
index d31a69adf03c..59e30935d04b 100644
--- a/sys/dev/dcons/dcons_crom.c
+++ b/sys/dev/dcons/dcons_crom.c
@@ -253,7 +253,7 @@ static device_method_t dcons_crom_methods[] = {
 	DEVMETHOD(device_probe,		dcons_crom_probe),
 	DEVMETHOD(device_attach,	dcons_crom_attach),
 	DEVMETHOD(device_detach,	dcons_crom_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dcons_crom_driver = {
diff --git a/sys/dev/dpaa/bman_fdt.c b/sys/dev/dpaa/bman_fdt.c
index 34b29ad6e236..330db7b89715 100644
--- a/sys/dev/dpaa/bman_fdt.c
+++ b/sys/dev/dpaa/bman_fdt.c
@@ -56,7 +56,7 @@ static device_method_t bman_methods[] = {
 	DEVMETHOD(device_resume,	bman_resume),
 	DEVMETHOD(device_shutdown,	bman_shutdown),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t bman_driver = {
@@ -93,7 +93,7 @@ static device_method_t bm_portals_methods[] = {
 	DEVMETHOD(device_attach,	bman_portals_fdt_attach),
 	DEVMETHOD(device_detach,	bman_portals_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t bm_portals_driver = {
diff --git a/sys/dev/dpaa/fman_fdt.c b/sys/dev/dpaa/fman_fdt.c
index 2386f4e7ec0b..4d3723b6de4d 100644
--- a/sys/dev/dpaa/fman_fdt.c
+++ b/sys/dev/dpaa/fman_fdt.c
@@ -56,7 +56,7 @@ static device_method_t fman_methods[] = {
 	DEVMETHOD(bus_alloc_resource,	fman_alloc_resource),
 	DEVMETHOD(bus_activate_resource,	fman_activate_resource),
 	DEVMETHOD(bus_release_resource,	fman_release_resource),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(fman, fman_driver, fman_methods,
diff --git a/sys/dev/dpaa/fman_mdio.c b/sys/dev/dpaa/fman_mdio.c
index 6ca12befe9e7..8df716fc5571 100644
--- a/sys/dev/dpaa/fman_mdio.c
+++ b/sys/dev/dpaa/fman_mdio.c
@@ -90,7 +90,7 @@ static device_method_t pqmdio_methods[] = {
 	DEVMETHOD(miibus_readreg,	pqmdio_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	pqmdio_miibus_writereg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static struct ofw_compat_data mdio_compat_data[] = {
diff --git a/sys/dev/dpaa/if_dtsec_fdt.c b/sys/dev/dpaa/if_dtsec_fdt.c
index b37f32c07b99..441ff9c96c50 100644
--- a/sys/dev/dpaa/if_dtsec_fdt.c
+++ b/sys/dev/dpaa/if_dtsec_fdt.c
@@ -77,7 +77,7 @@ static device_method_t dtsec_methods[] = {
 	DEVMETHOD(miibus_writereg,	dtsec_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	dtsec_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dtsec_driver = {
diff --git a/sys/dev/dpaa/qman_fdt.c b/sys/dev/dpaa/qman_fdt.c
index 35016073ba0e..89bf802e0067 100644
--- a/sys/dev/dpaa/qman_fdt.c
+++ b/sys/dev/dpaa/qman_fdt.c
@@ -56,7 +56,7 @@ static device_method_t qman_methods[] = {
 	DEVMETHOD(device_resume,	qman_resume),
 	DEVMETHOD(device_shutdown,	qman_shutdown),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qman_driver = {
@@ -93,7 +93,7 @@ static device_method_t qm_portals_methods[] = {
 	DEVMETHOD(device_attach,	qman_portals_fdt_attach),
 	DEVMETHOD(device_detach,	qman_portals_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qm_portals_driver = {
diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c
index 05397e880b85..659b852c046e 100644
--- a/sys/dev/dpms/dpms.c
+++ b/sys/dev/dpms/dpms.c
@@ -106,7 +106,7 @@ static device_method_t dpms_methods[] = {
 	DEVMETHOD(device_detach,	dpms_detach),
 	DEVMETHOD(device_suspend,	dpms_suspend),
 	DEVMETHOD(device_resume,	dpms_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dpms_driver = {
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index f57a19e8a112..21a520db8b89 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -684,7 +684,7 @@ static device_method_t dwc_methods[] = {
 	DEVMETHOD(miibus_writereg,	dwc1000_miibus_write_reg),
 	DEVMETHOD(miibus_statchg,	dwc1000_miibus_statchg),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t dwc_driver = {
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
index 6bae94aa6db6..f74c11bbf86b 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -348,7 +348,7 @@ static device_method_t fbd_methods[] = {
 
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t fbd_driver = {
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 58fcd1d5ea3d..2a1e426c24d0 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -2087,7 +2087,7 @@ static device_method_t fd_methods[] = {
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 	DEVMETHOD(device_suspend,	bus_generic_suspend), /* XXX */
 	DEVMETHOD(device_resume,	bus_generic_resume), /* XXX */
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fd_driver = {
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index c1c8991e3e33..0216e1fda793 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -210,7 +210,7 @@ static device_method_t fdc_methods[] = {
 	DEVMETHOD(bus_write_ivar,       fdc_write_ivar),
 	/* Our children never use any other bus interface methods. */
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fdc_driver = {
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 44d3425799e9..4f8d0087e9ab 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -613,7 +613,7 @@ static device_method_t fwe_methods[] = {
 	DEVMETHOD(device_probe,		fwe_probe),
 	DEVMETHOD(device_attach,	fwe_attach),
 	DEVMETHOD(device_detach,	fwe_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fwe_driver = {
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 41143e2e59d4..42f0c6f53743 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -916,7 +916,7 @@ static device_method_t fwip_methods[] = {
 	DEVMETHOD(device_probe,		fwip_probe),
 	DEVMETHOD(device_attach,	fwip_attach),
 	DEVMETHOD(device_detach,	fwip_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t fwip_driver = {
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index be1e60e45e75..9e76000f5fb6 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -2835,7 +2835,7 @@ static device_method_t sbp_methods[] = {
 	DEVMETHOD(device_detach,	sbp_detach),
 	DEVMETHOD(device_shutdown,	sbp_shutdown),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sbp_driver = {
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 4efc16c1ee47..96a86c25b684 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -2036,7 +2036,7 @@ static device_method_t sbp_targ_methods[] = {
 	DEVMETHOD(device_probe,		sbp_targ_probe),
 	DEVMETHOD(device_attach,	sbp_targ_attach),
 	DEVMETHOD(device_detach,	sbp_targ_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sbp_targ_driver = {
diff --git a/sys/dev/flash/cqspi.c b/sys/dev/flash/cqspi.c
index 4774d14add0e..9da1676bae5a 100644
--- a/sys/dev/flash/cqspi.c
+++ b/sys/dev/flash/cqspi.c
@@ -754,7 +754,7 @@ static device_method_t cqspi_methods[] = {
 	DEVMETHOD(qspi_write,		cqspi_write),
 	DEVMETHOD(qspi_erase,		cqspi_erase),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(cqspi, cqspi_driver, cqspi_methods,
diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c
index 44246f4b1c2d..12f431548d2a 100644
--- a/sys/dev/flash/flexspi/flex_spi.c
+++ b/sys/dev/flash/flexspi/flex_spi.c
@@ -970,7 +970,7 @@ static device_method_t flex_spi_methods[] = {
 	DEVMETHOD(device_attach,	flex_spi_attach),
 	DEVMETHOD(device_detach,	flex_spi_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t flex_spi_driver = {
diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index 64e3e53d4291..c7c95716aaed 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -673,7 +673,7 @@ static device_method_t mx25l_methods[] = {
 	DEVMETHOD(device_attach,	mx25l_attach),
 	DEVMETHOD(device_detach,	mx25l_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mx25l_driver = {
diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c
index 95d005125930..495649357bf1 100644
--- a/sys/dev/flash/n25q.c
+++ b/sys/dev/flash/n25q.c
@@ -469,7 +469,7 @@ static device_method_t n25q_methods[] = {
 	DEVMETHOD(device_attach,	n25q_attach),
 	DEVMETHOD(device_detach,	n25q_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t n25q_driver = {
diff --git a/sys/dev/flash/w25n.c b/sys/dev/flash/w25n.c
index c106b99434ca..660c9b9d7d8e 100644
--- a/sys/dev/flash/w25n.c
+++ b/sys/dev/flash/w25n.c
@@ -586,7 +586,7 @@ static device_method_t w25n_methods[] = {
 	DEVMETHOD(device_attach,	w25n_attach),
 	DEVMETHOD(device_detach,	w25n_detach),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t w25n_driver = {
diff --git a/sys/dev/ftwd/ftwd.c b/sys/dev/ftwd/ftwd.c
index 103c5f7c59d0..2f6f8892dc22 100644
--- a/sys/dev/ftwd/ftwd.c
+++ b/sys/dev/ftwd/ftwd.c
@@ -138,7 +138,7 @@ static device_method_t ftwd_methods[] = {
 	DEVMETHOD(device_probe,		ftwd_probe),
 	DEVMETHOD(device_attach,	ftwd_attach),
 	DEVMETHOD(device_detach,	ftwd_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ftwd_driver = {
diff --git a/sys/dev/fxp/inphy.c b/sys/dev/fxp/inphy.c
index 581849745724..a23f75cb39e2 100644
--- a/sys/dev/fxp/inphy.c
+++ b/sys/dev/fxp/inphy.c
@@ -63,7 +63,7 @@ static device_method_t inphy_methods[] = {
 	DEVMETHOD(device_attach,	inphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t inphy_driver = {
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index ef0a0e111339..bb2075e1d31c 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -266,7 +266,7 @@ static device_method_t glxiic_methods[] = {
 	DEVMETHOD(iicbus_transfer,	glxiic_transfer),
 	DEVMETHOD(iicbus_callback,	iicbus_null_callback),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t glxiic_driver = {
diff --git a/sys/dev/gpio/dwgpio/dwgpio.c b/sys/dev/gpio/dwgpio/dwgpio.c
index 3908113d5fd4..c46b3ab38745 100644
--- a/sys/dev/gpio/dwgpio/dwgpio.c
+++ b/sys/dev/gpio/dwgpio/dwgpio.c
@@ -408,7 +408,7 @@ static device_method_t dwgpio_methods[] = {
 	DEVMETHOD(gpio_pin_toggle,	dwgpio_pin_toggle),
 	DEVMETHOD(gpio_pin_setflags,	dwgpio_pin_setflags),
 	DEVMETHOD(gpio_pin_set,		dwgpio_pin_set),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dwgpio_driver = {
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index 638efa9e2ae2..38bc91f733aa 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -1258,7 +1258,7 @@ static device_method_t driver_methods[] = {
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hpt_pci_driver = {
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index b7b885a7c732..e31b75187e73 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -1728,7 +1728,7 @@ static device_method_t driver_methods[] = {
 	DEVMETHOD(device_attach,    hptiop_attach),
 	DEVMETHOD(device_detach,    hptiop_detach),
 	DEVMETHOD(device_shutdown,  hptiop_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static struct hptiop_adapter_ops hptiop_itl_ops = {
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index fa0f78a7e01a..f3af3b767a77 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -1548,7 +1548,7 @@ static device_method_t driver_methods[] = {
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hpt_pci_driver = {
diff --git a/sys/dev/hyperv/input/hv_kbdc.c b/sys/dev/hyperv/input/hv_kbdc.c
index 4f098a99a06b..dc5435b25ff2 100644
--- a/sys/dev/hyperv/input/hv_kbdc.c
+++ b/sys/dev/hyperv/input/hv_kbdc.c
@@ -515,7 +515,7 @@ static device_method_t kbd_methods[] = {
 	DEVMETHOD(device_probe, hv_kbd_probe),
 	DEVMETHOD(device_attach, hv_kbd_attach),
 	DEVMETHOD(device_detach, hv_kbd_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t kbd_driver = {HVKBD_DRIVER_NAME , kbd_methods, sizeof(hv_kbd_sc)};
diff --git a/sys/dev/hyperv/utilities/hv_kvp.c b/sys/dev/hyperv/utilities/hv_kvp.c
index d8ab583d69fa..587e2154f37f 100644
--- a/sys/dev/hyperv/utilities/hv_kvp.c
+++ b/sys/dev/hyperv/utilities/hv_kvp.c
@@ -905,7 +905,7 @@ static device_method_t kvp_methods[] = {
 	DEVMETHOD(device_probe, hv_kvp_probe),
 	DEVMETHOD(device_attach, hv_kvp_attach),
 	DEVMETHOD(device_detach, hv_kvp_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t kvp_driver = { "hvkvp", kvp_methods, sizeof(hv_kvp_sc)};
diff --git a/sys/dev/hyperv/utilities/hv_snapshot.c b/sys/dev/hyperv/utilities/hv_snapshot.c
index 9426544a0700..d8b8df8d8581 100644
--- a/sys/dev/hyperv/utilities/hv_snapshot.c
+++ b/sys/dev/hyperv/utilities/hv_snapshot.c
@@ -1046,7 +1046,7 @@ static device_method_t vss_methods[] = {
 	DEVMETHOD(device_probe, hv_vss_probe),
 	DEVMETHOD(device_attach, hv_vss_attach),
 	DEVMETHOD(device_detach, hv_vss_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t vss_driver = { "hvvss", vss_methods, sizeof(hv_vss_sc)};
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 1e3877652f8a..b884fdf3899e 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -66,7 +66,7 @@ static device_method_t idad_methods[] = {
 	DEVMETHOD(device_probe,		idad_probe),
 	DEVMETHOD(device_attach,	idad_attach),
 	DEVMETHOD(device_detach,	idad_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t idad_driver = {
diff --git a/sys/dev/iicbus/adc/ad7417.c b/sys/dev/iicbus/adc/ad7417.c
index 33a8f0d55e94..846af9578c5f 100644
--- a/sys/dev/iicbus/adc/ad7417.c
+++ b/sys/dev/iicbus/adc/ad7417.c
@@ -108,7 +108,7 @@ static device_method_t  ad7417_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		ad7417_probe),
 	DEVMETHOD(device_attach,	ad7417_attach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t ad7417_driver = {
diff --git a/sys/dev/iicbus/controller/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c
index a82eabff12fb..6caaac99e39d 100644
--- a/sys/dev/iicbus/controller/twsi/a10_twsi.c
+++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c
@@ -139,7 +139,7 @@ static device_method_t a10_twsi_methods[] = {
 	/* OFW methods */
 	DEVMETHOD(ofw_bus_get_node,	a10_twsi_get_node),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(iichb, a10_twsi_driver, a10_twsi_methods,
diff --git a/sys/dev/iicbus/controller/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c
index 46704e1eab65..73412e87d61e 100644
--- a/sys/dev/iicbus/controller/twsi/twsi.c
+++ b/sys/dev/iicbus/controller/twsi/twsi.c
@@ -869,7 +869,7 @@ static device_method_t twsi_methods[] = {
 	DEVMETHOD(iicbus_read,		twsi_read),
 	DEVMETHOD(iicbus_reset,		twsi_reset),
 	DEVMETHOD(iicbus_transfer,	twsi_transfer),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(twsi, twsi_driver, twsi_methods,
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index caca35a3d22b..b827cfb32b45 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -111,7 +111,7 @@ static device_method_t ic_methods[] = {
 	/* iicbus interface */
 	DEVMETHOD(iicbus_intr,		icintr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ic_driver = {
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 3b7d603005aa..efb8569a23c0 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -108,7 +108,7 @@ static device_method_t iic_methods[] = {
 	/* iicbus interface */
 	DEVMETHOD(iicbus_intr,		iicbus_generic_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t iic_driver = {
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 5f6423135f46..a9da39e45122 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -121,7 +121,7 @@ static device_method_t iicbb_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	iicbb_get_node),
 #endif
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t iicbb_driver = {
diff --git a/sys/dev/iicbus/pwm/adt746x.c b/sys/dev/iicbus/pwm/adt746x.c
index 13dcf2b256c0..0e54294cdb42 100644
--- a/sys/dev/iicbus/pwm/adt746x.c
+++ b/sys/dev/iicbus/pwm/adt746x.c
@@ -131,7 +131,7 @@ static device_method_t  adt746x_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,	 adt746x_probe),
 	DEVMETHOD(device_attach, adt746x_attach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t adt746x_driver = {
diff --git a/sys/dev/iicbus/sensor/ds1631.c b/sys/dev/iicbus/sensor/ds1631.c
index 519756ae864e..ef71ac6a183c 100644
--- a/sys/dev/iicbus/sensor/ds1631.c
+++ b/sys/dev/iicbus/sensor/ds1631.c
@@ -101,7 +101,7 @@ static device_method_t  ds1631_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		ds1631_probe),
 	DEVMETHOD(device_attach,	ds1631_attach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t ds1631_driver = {
diff --git a/sys/dev/iicbus/sensor/ds1775.c b/sys/dev/iicbus/sensor/ds1775.c
index 257879345100..c8d9e5ba1317 100644
--- a/sys/dev/iicbus/sensor/ds1775.c
+++ b/sys/dev/iicbus/sensor/ds1775.c
@@ -74,7 +74,7 @@ static device_method_t  ds1775_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		ds1775_probe),
 	DEVMETHOD(device_attach,	ds1775_attach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t ds1775_driver = {
diff --git a/sys/dev/iicbus/sensor/max6690.c b/sys/dev/iicbus/sensor/max6690.c
index 87715229b80c..7640e5e65867 100644
--- a/sys/dev/iicbus/sensor/max6690.c
+++ b/sys/dev/iicbus/sensor/max6690.c
@@ -87,7 +87,7 @@ static device_method_t  max6690_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		max6690_probe),
 	DEVMETHOD(device_attach,	max6690_attach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t max6690_driver = {
diff --git a/sys/dev/ipmi/ipmi_acpi.c b/sys/dev/ipmi/ipmi_acpi.c
index e51e6364e41e..24c766de4a75 100644
--- a/sys/dev/ipmi/ipmi_acpi.c
+++ b/sys/dev/ipmi/ipmi_acpi.c
@@ -197,7 +197,7 @@ static device_method_t ipmi_methods[] = {
 	DEVMETHOD(device_probe,		ipmi_acpi_probe),
 	DEVMETHOD(device_attach,	ipmi_acpi_attach),
 	DEVMETHOD(device_detach,	ipmi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipmi_acpi_driver = {
diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c
index 0c74307db00d..6d84496b0ef1 100644
--- a/sys/dev/ipmi/ipmi_isa.c
+++ b/sys/dev/ipmi/ipmi_isa.c
@@ -277,7 +277,7 @@ static device_method_t ipmi_methods[] = {
 	DEVMETHOD(device_probe,		ipmi_isa_probe),
 	DEVMETHOD(device_attach,	ipmi_isa_attach),
 	DEVMETHOD(device_detach,	ipmi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipmi_isa_driver = {
diff --git a/sys/dev/ipmi/ipmi_pci.c b/sys/dev/ipmi/ipmi_pci.c
index 9067742b3e09..14efb0841590 100644
--- a/sys/dev/ipmi/ipmi_pci.c
+++ b/sys/dev/ipmi/ipmi_pci.c
@@ -169,7 +169,7 @@ static device_method_t ipmi_methods[] = {
 	DEVMETHOD(device_probe,     ipmi_pci_probe),
 	DEVMETHOD(device_attach,    ipmi_pci_attach),
 	DEVMETHOD(device_detach,    ipmi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipmi_pci_driver = {
@@ -284,7 +284,7 @@ static device_method_t ipmi2_methods[] = {
 	DEVMETHOD(device_probe,     ipmi2_pci_probe),
 	DEVMETHOD(device_attach,    ipmi2_pci_attach),
 	DEVMETHOD(device_detach,    ipmi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipmi2_pci_driver = {
diff --git a/sys/dev/ipmi/ipmi_smbus.c b/sys/dev/ipmi/ipmi_smbus.c
index 9516b3dfa487..5113a3e5cbad 100644
--- a/sys/dev/ipmi/ipmi_smbus.c
+++ b/sys/dev/ipmi/ipmi_smbus.c
@@ -118,7 +118,7 @@ static device_method_t ipmi_methods[] = {
 	DEVMETHOD(device_probe,		ipmi_smbus_probe),
 	DEVMETHOD(device_attach,	ipmi_smbus_attach),
 	DEVMETHOD(device_detach,	ipmi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipmi_smbus_driver = {
diff --git a/sys/dev/ips/ips_disk.c b/sys/dev/ips/ips_disk.c
index 09ab571d2734..6a33bff9cbf7 100644
--- a/sys/dev/ips/ips_disk.c
+++ b/sys/dev/ips/ips_disk.c
@@ -50,7 +50,7 @@ static device_method_t ipsd_methods[] = {
 	DEVMETHOD(device_probe,		ipsd_probe),
 	DEVMETHOD(device_attach,	ipsd_attach),
 	DEVMETHOD(device_detach,	ipsd_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ipsd_driver = {
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c
index 1dede4e45b4c..b40350c36fca 100644
--- a/sys/dev/isci/isci.c
+++ b/sys/dev/isci/isci.c
@@ -72,7 +72,7 @@ static device_method_t isci_pci_methods[] = {
 	 DEVMETHOD(device_probe,  isci_probe),
 	 DEVMETHOD(device_attach, isci_attach),
 	 DEVMETHOD(device_detach, isci_detach),
-	 { 0, 0 }
+	 DEVMETHOD_END
 };
 
 static driver_t isci_pci_driver = {
diff --git a/sys/dev/iscsi/icl_soft.c b/sys/dev/iscsi/icl_soft.c
index 812793a9fba3..8847680072d3 100644
--- a/sys/dev/iscsi/icl_soft.c
+++ b/sys/dev/iscsi/icl_soft.c
@@ -166,7 +166,7 @@ static kobj_method_t icl_soft_methods[] = {
 #ifdef ICL_KERNEL_PROXY
 	KOBJMETHOD(icl_conn_connect, icl_soft_conn_connect),
 #endif
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 DEFINE_CLASS(icl_soft, icl_soft_methods, sizeof(struct icl_soft_conn));
diff --git a/sys/dev/iser/icl_iser.c b/sys/dev/iser/icl_iser.c
index f5e75849d470..627538081585 100644
--- a/sys/dev/iser/icl_iser.c
+++ b/sys/dev/iser/icl_iser.c
@@ -69,7 +69,7 @@ static kobj_method_t icl_iser_methods[] = {
 	KOBJMETHOD(icl_conn_task_done, iser_conn_task_done),
 	KOBJMETHOD(icl_conn_pdu_get_bio, iser_conn_pdu_get_bio),
 	KOBJMETHOD(icl_conn_pdu_get_data, iser_conn_pdu_get_data),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 DEFINE_CLASS(icl_iser, icl_iser_methods, sizeof(struct iser_conn));
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index e8fd7b3cf571..4992379b1636 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -212,7 +212,7 @@ static device_method_t isp_pci_methods[] = {
 	DEVMETHOD(device_probe,		isp_pci_probe),
 	DEVMETHOD(device_attach,	isp_pci_attach),
 	DEVMETHOD(device_detach,	isp_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t isp_pci_driver = {
diff --git a/sys/dev/itwd/itwd.c b/sys/dev/itwd/itwd.c
index 06120f1fdeac..ac3e521321c6 100644
--- a/sys/dev/itwd/itwd.c
+++ b/sys/dev/itwd/itwd.c
@@ -217,7 +217,7 @@ static device_method_t itwd_methods[] = {
 	DEVMETHOD(device_detach,	itwd_detach),
 
 	/* Terminate method list */
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t itwd_driver = {
diff --git a/sys/dev/le/if_le_isa.c b/sys/dev/le/if_le_isa.c
index e3c9c21df42e..862e08306bad 100644
--- a/sys/dev/le/if_le_isa.c
+++ b/sys/dev/le/if_le_isa.c
@@ -127,7 +127,7 @@ static device_method_t le_isa_methods[] = {
 	DEVMETHOD(device_suspend,	le_isa_suspend),
 	DEVMETHOD(device_resume,	le_isa_resume),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 struct le_isa_param {
diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c
index cee1e80295c9..4a215fd225ee 100644
--- a/sys/dev/le/if_le_pci.c
+++ b/sys/dev/le/if_le_pci.c
@@ -127,7 +127,7 @@ static device_method_t le_pci_methods[] = {
 	DEVMETHOD(device_suspend,	le_pci_suspend),
 	DEVMETHOD(device_resume,	le_pci_resume),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(le, le_pci_driver, le_pci_methods, sizeof(struct le_pci_softc));
diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c
index 29c7bdc79aa1..999dcdfd1c97 100644
--- a/sys/dev/mfi/mfi_disk.c
+++ b/sys/dev/mfi/mfi_disk.c
@@ -70,7 +70,7 @@ static device_method_t mfi_disk_methods[] = {
 	DEVMETHOD(device_probe,		mfi_disk_probe),
 	DEVMETHOD(device_attach,	mfi_disk_attach),
 	DEVMETHOD(device_detach,	mfi_disk_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mfi_disk_driver = {
diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c
index 4353e2598f5c..979c3ea38d5b 100644
--- a/sys/dev/mfi/mfi_syspd.c
+++ b/sys/dev/mfi/mfi_syspd.c
@@ -75,7 +75,7 @@ static device_method_t mfi_syspd_methods[] = {
 	DEVMETHOD(device_probe,		mfi_syspd_probe),
 	DEVMETHOD(device_attach,	mfi_syspd_attach),
 	DEVMETHOD(device_detach,	mfi_syspd_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mfi_syspd_driver = {
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index 25d213ff16ee..7ed40d898676 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -166,7 +166,7 @@ static device_method_t mge_methods[] = {
 	/* MDIO interface */
 	DEVMETHOD(mdio_readreg,		mge_mdio_readreg),
 	DEVMETHOD(mdio_writereg,	mge_mdio_writereg),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(mge, mge_driver, mge_methods, sizeof(struct mge_softc));
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 3f00dfd92f9c..65567606f1b6 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -62,7 +62,7 @@ static device_method_t mlxd_methods[] = {
     DEVMETHOD(device_probe,	mlxd_probe),
     DEVMETHOD(device_attach,	mlxd_attach),
     DEVMETHOD(device_detach,	mlxd_detach),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t mlxd_driver = {
diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c
index b436541b26c0..89b87c4e2ef7 100644
--- a/sys/dev/mpi3mr/mpi3mr_pci.c
+++ b/sys/dev/mpi3mr/mpi3mr_pci.c
@@ -65,7 +65,7 @@ static device_method_t mpi3mr_methods[] = {
 	DEVMETHOD(device_resume,	mpi3mr_pci_resume),
 	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 char fmt_os_ver[16];
diff --git a/sys/dev/mpr/mpr_pci.c b/sys/dev/mpr/mpr_pci.c
index a04ef7c6fb4d..27b90c31b521 100644
--- a/sys/dev/mpr/mpr_pci.c
+++ b/sys/dev/mpr/mpr_pci.c
@@ -76,7 +76,7 @@ static device_method_t mpr_methods[] = {
 	DEVMETHOD(device_resume,	mpr_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 mpr_pci_driver = {
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 4132af157a62..aafe68d04685 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -579,7 +579,7 @@ static device_method_t mvsch_methods[] = {
 	DEVMETHOD(device_detach,    mvs_ch_detach),
 	DEVMETHOD(device_suspend,   mvs_ch_suspend),
 	DEVMETHOD(device_resume,    mvs_ch_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t mvsch_driver = {
         "mvsch",
diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c
index 322da77968cf..19bc52d91050 100644
--- a/sys/dev/mvs/mvs_pci.c
+++ b/sys/dev/mvs/mvs_pci.c
@@ -510,7 +510,7 @@ static device_method_t mvs_methods[] = {
 	DEVMETHOD(bus_child_location, mvs_child_location),
 	DEVMETHOD(bus_get_dma_tag,  mvs_get_dma_tag),
 	DEVMETHOD(mvs_edma,         mvs_edma),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t mvs_driver = {
         "mvs",
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 8dc5ed7a3034..30e61f2e94fc 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -448,7 +448,7 @@ static device_method_t mvs_methods[] = {
 	DEVMETHOD(bus_child_location, mvs_child_location),
 	DEVMETHOD(bus_get_dma_tag,  mvs_get_dma_tag),
 	DEVMETHOD(mvs_edma,         mvs_edma),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 static driver_t mvs_driver = {
         "mvs",
diff --git a/sys/dev/ncthwm/ncthwm.c b/sys/dev/ncthwm/ncthwm.c
index b36f677703ea..99d32be8a82d 100644
--- a/sys/dev/ncthwm/ncthwm.c
+++ b/sys/dev/ncthwm/ncthwm.c
@@ -244,7 +244,7 @@ static device_method_t ncthwm_methods[] = {
 	DEVMETHOD(device_detach,	ncthwm_detach),
 
 	/* Terminate method list */
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ncthwm_driver = {
diff --git a/sys/dev/nfsmb/nfsmb.c b/sys/dev/nfsmb/nfsmb.c
index b88b2ca0001f..9e59966481e5 100644
--- a/sys/dev/nfsmb/nfsmb.c
+++ b/sys/dev/nfsmb/nfsmb.c
@@ -601,7 +601,7 @@ static device_method_t nfsmb_methods[] = {
 	DEVMETHOD(smbus_readw,		nfsmb_readw),
 	DEVMETHOD(smbus_bwrite,		nfsmb_bwrite),
 	DEVMETHOD(smbus_bread,		nfsmb_bread),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static device_method_t nfsmbsub_methods[] = {
@@ -621,7 +621,7 @@ static device_method_t nfsmbsub_methods[] = {
 	DEVMETHOD(smbus_readw,		nfsmb_readw),
 	DEVMETHOD(smbus_bwrite,		nfsmb_bwrite),
 	DEVMETHOD(smbus_bread,		nfsmb_bread),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nfsmb_driver = {
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index 29c1e012bf24..1b32af2c6e4e 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -627,7 +627,7 @@ static device_method_t nvdc_methods[] = {
 	DEVMETHOD(nvme_ns_changed,	nvdc_ns_changed),
 	DEVMETHOD(nvme_controller_failed, nvdc_controller_failed),
 	DEVMETHOD(nvme_handle_aen,   	nvdc_handle_aen),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nvdc_driver = {
diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c
index b06661226d34..c50971f83975 100644
--- a/sys/dev/nvme/nvme_ahci.c
+++ b/sys/dev/nvme/nvme_ahci.c
@@ -43,7 +43,7 @@ static device_method_t nvme_ahci_methods[] = {
 	DEVMETHOD(device_attach,    nvme_ahci_attach),
 	DEVMETHOD(device_detach,    nvme_ahci_detach),
 	DEVMETHOD(device_shutdown,  nvme_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nvme_ahci_driver = {
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index cecb05ca0a92..5784c6d1be96 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -54,7 +54,7 @@ static device_method_t nvme_pci_methods[] = {
 	DEVMETHOD(device_suspend,   nvme_pci_suspend),
 	DEVMETHOD(device_resume,    nvme_pci_resume),
 	DEVMETHOD(device_shutdown,  nvme_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nvme_pci_driver = {
diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
index f7db4a9ff4fb..a3176f12b11a 100644
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -486,7 +486,7 @@ static device_method_t nvme_sim_methods[] = {
 	DEVMETHOD(nvme_ns_changed,   	nvme_sim_ns_changed),
 	DEVMETHOD(nvme_controller_failed, nvme_sim_controller_failed),
 	DEVMETHOD(nvme_handle_aen,   	nvme_sim_handle_aen),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nvme_sim_driver = {
diff --git a/sys/dev/ow/ow.c b/sys/dev/ow/ow.c
index 0325e6b324c8..493e22fdc8d2 100644
--- a/sys/dev/ow/ow.c
+++ b/sys/dev/ow/ow.c
@@ -706,7 +706,7 @@ static device_method_t ow_methods[] = {
 	DEVMETHOD(own_acquire_bus,	ow_acquire_bus),
 	DEVMETHOD(own_release_bus,	ow_release_bus),
 	DEVMETHOD(own_crc,		ow_crc),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ow_driver = {
diff --git a/sys/dev/ow/ow_temp.c b/sys/dev/ow/ow_temp.c
index 1fb5af2d53e8..1a5efbafab8a 100644
--- a/sys/dev/ow/ow_temp.c
+++ b/sys/dev/ow/ow_temp.c
@@ -266,7 +266,7 @@ static device_method_t ow_temp_methods[] = {
 	DEVMETHOD(device_probe,		ow_temp_probe),
 	DEVMETHOD(device_attach,	ow_temp_attach),
 	DEVMETHOD(device_detach,	ow_temp_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ow_temp_driver = {
diff --git a/sys/dev/ow/owc_gpiobus.c b/sys/dev/ow/owc_gpiobus.c
index f010a4dc75f1..a11570cccdf0 100644
--- a/sys/dev/ow/owc_gpiobus.c
+++ b/sys/dev/ow/owc_gpiobus.c
@@ -380,7 +380,7 @@ static device_method_t owc_gpiobus_methods[] = {
 	DEVMETHOD(owll_write_zero,	owc_gpiobus_write_zero),
 	DEVMETHOD(owll_read_data,	owc_gpiobus_read_data),
 	DEVMETHOD(owll_reset_and_presence,	owc_gpiobus_reset_and_presence),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t owc_gpiobus_driver = {
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index 66fea479f5ac..662846210fae 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -121,7 +121,7 @@ static device_method_t pbio_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		pbioprobe),
 	DEVMETHOD(device_attach,	pbioattach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static char driver_name[] = "pbio";
diff --git a/sys/dev/pcf/pcf_isa.c b/sys/dev/pcf/pcf_isa.c
index c797dc31e6d9..b2e9e6b61ede 100644
--- a/sys/dev/pcf/pcf_isa.c
+++ b/sys/dev/pcf/pcf_isa.c
@@ -78,7 +78,7 @@ static device_method_t pcf_isa_methods[] = {
 	DEVMETHOD(iicbus_write,		pcf_write),
 	DEVMETHOD(iicbus_read,		pcf_read),
 	DEVMETHOD(iicbus_reset,		pcf_rst_card),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pcf_isa_driver = {
diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
index cad175f301a3..1854b561e047 100644
--- a/sys/dev/pci/fixup_pci.c
+++ b/sys/dev/pci/fixup_pci.c
@@ -55,7 +55,7 @@ static void	fixc1_nforce2(device_t dev);
 static device_method_t fixup_pci_methods[] = {
     /* Device interface */
     DEVMETHOD(device_probe,		fixup_pci_probe),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t fixup_pci_driver = {
diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c
index f59211a14de9..dce64ffb4c17 100644
--- a/sys/dev/pci/hostb_pci.c
+++ b/sys/dev/pci/hostb_pci.c
@@ -275,7 +275,7 @@ static device_method_t pci_hostb_methods[] = {
 	DEVMETHOD(pci_find_next_extcap,	pci_hostb_find_next_extcap),
 	DEVMETHOD(pci_find_htcap,	pci_hostb_find_htcap),
 	DEVMETHOD(pci_find_next_htcap,	pci_hostb_find_next_htcap),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pci_hostb_driver = {
diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c
index 8a12e43bcae3..7946c2017bd4 100644
--- a/sys/dev/pci/ignore_pci.c
+++ b/sys/dev/pci/ignore_pci.c
@@ -47,7 +47,7 @@ static device_method_t ignore_pci_methods[] = {
     /* Device interface */
     DEVMETHOD(device_probe,		ignore_pci_probe),
     DEVMETHOD(device_attach,		ignore_pci_attach),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t ignore_pci_driver = {
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 23340696f0f0..39b2fcab67b4 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -746,7 +746,7 @@ static device_method_t vga_pci_methods[] = {
 	DEVMETHOD(pci_release_msi,	vga_pci_release_msi),
 	DEVMETHOD(pci_msi_count,	vga_pci_msi_count),
 	DEVMETHOD(pci_msix_count,	vga_pci_msix_count),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t vga_pci_driver = {
diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
index cd1b80c3d712..25f822f73a37 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
@@ -6586,7 +6586,7 @@ static device_method_t agtiapi_methods[] = {   // Device interface
   DEVMETHOD( device_shutdown, agtiapi_shutdown   ),
   DEVMETHOD( device_suspend,  agtiapi_suspend    ),
   DEVMETHOD( device_resume,   agtiapi_resume     ),
-  { 0, 0 }
+  DEVMETHOD_END
 };
 
 static driver_t pmspcv_driver = {
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c
index ca7a7358bd4a..7f11bfa89ebb 100644
--- a/sys/dev/powermac_nvram/powermac_nvram.c
+++ b/sys/dev/powermac_nvram/powermac_nvram.c
@@ -74,7 +74,7 @@ static device_method_t	powermac_nvram_methods[] = {
 	DEVMETHOD(device_probe,		powermac_nvram_probe),
 	DEVMETHOD(device_attach,	powermac_nvram_attach),
 	DEVMETHOD(device_detach,	powermac_nvram_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t	powermac_nvram_driver = {
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 16139139c0e7..22a8add2e55a 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -826,7 +826,7 @@ static device_method_t lp_methods[] = {
 	DEVMETHOD(device_probe,		lp_probe),
 	DEVMETHOD(device_attach,	lp_attach),
 	DEVMETHOD(device_detach,	lp_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t lp_driver = {
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 401e94d25727..97f710d1216f 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -978,7 +978,7 @@ static device_method_t lpt_methods[] = {
 	DEVMETHOD(device_probe,		lpt_probe),
 	DEVMETHOD(device_attach,	lpt_attach),
 	DEVMETHOD(device_detach,	lpt_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t lpt_driver = {
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 47a1a010a311..2cf8c0d4e271 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -321,7 +321,7 @@ static device_method_t pcfclock_methods[] = {
 	DEVMETHOD(device_identify,	pcfclock_identify),
 	DEVMETHOD(device_probe,		pcfclock_probe),
 	DEVMETHOD(device_attach,	pcfclock_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pcfclock_driver = {
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 2c3f17318747..c4931ca58172 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -574,7 +574,7 @@ static device_method_t ppbus_methods[] = {
 	DEVMETHOD(bus_teardown_intr,	ppbus_teardown_intr),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppbus_driver = {
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 3fd5f43a4a3a..3de63776210f 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -605,7 +605,7 @@ static device_method_t ppi_methods[] = {
 	DEVMETHOD(device_probe,		ppi_probe),
 	DEVMETHOD(device_attach,	ppi_attach),
 	DEVMETHOD(device_detach,	ppi_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppi_driver = {
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 80581e3beae7..ed37b7e27231 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -332,7 +332,7 @@ static device_method_t pps_methods[] = {
 	DEVMETHOD(device_identify,	ppsidentify),
 	DEVMETHOD(device_probe,		ppsprobe),
 	DEVMETHOD(device_attach,	ppsattach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pps_driver = {
diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
index a9d05cf7c2ff..41c34086f42f 100644
--- a/sys/dev/ppc/ppc_acpi.c
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -79,7 +79,7 @@ static device_method_t ppc_acpi_methods[] = {
 #else
 	DEVMETHOD(ppbus_write,		ppc_write),
 #endif
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppc_acpi_driver = {
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index e1424295f239..907036bcc7ba 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -73,7 +73,7 @@ static device_method_t ppc_isa_methods[] = {
 	DEVMETHOD(ppbus_ecp_sync,	ppc_ecp_sync),
 	DEVMETHOD(ppbus_read,		ppc_read),
 	DEVMETHOD(ppbus_write,		ppc_isa_write),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppc_isa_driver = {
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index d2fd2478fa7c..534ef40d8f37 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -64,7 +64,7 @@ static device_method_t ppc_pci_methods[] = {
 	DEVMETHOD(ppbus_ecp_sync,	ppc_ecp_sync),
 	DEVMETHOD(ppbus_read,		ppc_read),
 	DEVMETHOD(ppbus_write,		ppc_write),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppc_pci_driver = {
diff --git a/sys/dev/ppc/ppc_puc.c b/sys/dev/ppc/ppc_puc.c
index b81e1dcfd45a..811ffb89fbb9 100644
--- a/sys/dev/ppc/ppc_puc.c
+++ b/sys/dev/ppc/ppc_puc.c
@@ -66,7 +66,7 @@ static device_method_t ppc_puc_methods[] = {
 	DEVMETHOD(ppbus_ecp_sync,	ppc_ecp_sync),
 	DEVMETHOD(ppbus_read,		ppc_read),
 	DEVMETHOD(ppbus_write,		ppc_write),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ppc_puc_driver = {
diff --git a/sys/dev/pst/pst-pci.c b/sys/dev/pst/pst-pci.c
index 3c1f740cf2f8..3815deef4039 100644
--- a/sys/dev/pst/pst-pci.c
+++ b/sys/dev/pst/pst-pci.c
@@ -118,7 +118,7 @@ static device_method_t pst_pci_methods[] = {
     DEVMETHOD(device_probe,		iop_pci_probe),
     DEVMETHOD(device_attach,		iop_pci_attach),
     DEVMETHOD(device_detach,		iop_pci_detach),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t pst_pci_driver = {
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 3e98ed9eb1d2..5895ddfaa99e 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -368,7 +368,7 @@ bpack(int8_t *src, int8_t *dst, int len)
 static device_method_t pst_methods[] = {
     DEVMETHOD(device_probe,	pst_probe),
     DEVMETHOD(device_attach,	pst_attach),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t pst_driver = {
diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c
index 85c16842283c..215837968505 100644
--- a/sys/dev/qlnx/qlnxe/qlnx_os.c
+++ b/sys/dev/qlnx/qlnxe/qlnx_os.c
@@ -191,7 +191,7 @@ static device_method_t qlnx_pci_methods[] = {
 	DEVMETHOD(pci_iov_uninit, qlnx_iov_uninit),
 	DEVMETHOD(pci_iov_add_vf, qlnx_iov_add_vf),
 #endif /* #ifdef CONFIG_ECORE_SRIOV */
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qlnx_pci_driver = {
@@ -211,7 +211,7 @@ static device_method_t qlnxv_pci_methods[] = {
 	DEVMETHOD(device_probe, qlnx_pci_probe),
 	DEVMETHOD(device_attach, qlnx_pci_attach),
 	DEVMETHOD(device_detach, qlnx_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qlnxv_pci_driver = {
diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c
index 87e504a83c79..440490dc17a1 100644
--- a/sys/dev/qlxgb/qla_os.c
+++ b/sys/dev/qlxgb/qla_os.c
@@ -93,7 +93,7 @@ static device_method_t qla_pci_methods[] = {
 	DEVMETHOD(device_probe, qla_pci_probe),
 	DEVMETHOD(device_attach, qla_pci_attach),
 	DEVMETHOD(device_detach, qla_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qla_pci_driver = {
diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c
index a12f1efec082..7cf6e3296d25 100644
--- a/sys/dev/qlxgbe/ql_os.c
+++ b/sys/dev/qlxgbe/ql_os.c
@@ -106,7 +106,7 @@ static device_method_t qla_pci_methods[] = {
 	DEVMETHOD(device_probe, qla_pci_probe),
 	DEVMETHOD(device_attach, qla_pci_attach),
 	DEVMETHOD(device_detach, qla_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qla_pci_driver = {
diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c
index eca7006850e0..9173037457c2 100644
--- a/sys/dev/qlxge/qls_os.c
+++ b/sys/dev/qlxge/qls_os.c
@@ -99,7 +99,7 @@ static device_method_t qla_pci_methods[] = {
 	DEVMETHOD(device_probe, qls_pci_probe),
 	DEVMETHOD(device_attach, qls_pci_attach),
 	DEVMETHOD(device_detach, qls_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t qla_pci_driver = {
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 113ff3d954e4..9e75629dcb84 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -53,7 +53,7 @@ static device_method_t sbni_isa_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,	sbni_probe_isa),
 	DEVMETHOD(device_attach, sbni_attach_isa),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sbni_isa_driver = {
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index b1b0614613eb..549618dd1b0e 100644
--- a/sys/dev/sbni/if_sbni_pci.c
+++ b/sys/dev/sbni/if_sbni_pci.c
@@ -55,7 +55,7 @@ static device_method_t sbni_pci_methods[] = {
 	DEVMETHOD(device_probe,	sbni_pci_probe),
 	DEVMETHOD(device_attach, sbni_pci_attach),
 	DEVMETHOD(device_detach, sbni_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t sbni_pci_driver = {
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 202fc24143b5..50a9ceec3707 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -433,7 +433,7 @@ static device_method_t siis_methods[] = {
 	DEVMETHOD(bus_teardown_intr,siis_teardown_intr),
 	DEVMETHOD(bus_child_location, siis_child_location),
 	DEVMETHOD(bus_get_dma_tag,  siis_get_dma_tag),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t siis_driver = {
@@ -631,7 +631,7 @@ static device_method_t siisch_methods[] = {
 	DEVMETHOD(device_detach,    siis_ch_detach),
 	DEVMETHOD(device_suspend,   siis_ch_suspend),
 	DEVMETHOD(device_resume,    siis_ch_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t siisch_driver = {
diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c
index dea7809a1b8e..1f006939bf7c 100644
--- a/sys/dev/smartpqi/smartpqi_main.c
+++ b/sys/dev/smartpqi/smartpqi_main.c
@@ -561,7 +561,7 @@ static device_method_t pqi_methods[] = {
 	DEVMETHOD(device_suspend,	smartpqi_suspend),
 	DEVMETHOD(device_resume,	smartpqi_resume),
 	DEVMETHOD(device_shutdown,	smartpqi_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t smartpqi_pci_driver = {
diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c
index 8f2b4a56b37b..39663e2ee155 100644
--- a/sys/dev/smbios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -310,7 +310,7 @@ static device_method_t smbios_methods[] = {
 	DEVMETHOD(device_probe,         smbios_probe),
 	DEVMETHOD(device_attach,        smbios_attach),
 	DEVMETHOD(device_detach,        smbios_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t smbios_driver = {
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 514c42b88131..fa28be3a71b0 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -104,7 +104,7 @@ static device_method_t smb_methods[] = {
 
 	/* smbus interface */
 	DEVMETHOD(smbus_intr,		smbus_generic_intr),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t smb_driver = {
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
index cc05cfd45f67..34dd1b07861b 100644
--- a/sys/dev/smc/if_smc.c
+++ b/sys/dev/smc/if_smc.c
@@ -480,7 +480,7 @@ static device_method_t smc_methods[] = {
 	DEVMETHOD(miibus_readreg,	smc_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	smc_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	smc_miibus_statchg),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t smc_driver = {
diff --git a/sys/dev/smc/if_smc_acpi.c b/sys/dev/smc/if_smc_acpi.c
index 3701a742d54c..b1cf5f127b88 100644
--- a/sys/dev/smc/if_smc_acpi.c
+++ b/sys/dev/smc/if_smc_acpi.c
@@ -63,7 +63,7 @@ smc_acpi_probe(device_t dev)
 static device_method_t smc_acpi_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		smc_acpi_probe),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(smc, smc_acpi_driver, smc_acpi_methods,
diff --git a/sys/dev/smc/if_smc_fdt.c b/sys/dev/smc/if_smc_fdt.c
index 61f3e5efae8d..1931aa9d88cb 100644
--- a/sys/dev/smc/if_smc_fdt.c
+++ b/sys/dev/smc/if_smc_fdt.c
@@ -68,7 +68,7 @@ smc_fdt_probe(device_t dev)
 static device_method_t smc_fdt_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		smc_fdt_probe),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 DEFINE_CLASS_1(smc, smc_fdt_driver, smc_fdt_methods,
diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c
index 9dc3676a37a0..8e9fe78317cb 100644
--- a/sys/dev/sound/macio/davbus.c
+++ b/sys/dev/sound/macio/davbus.c
@@ -76,7 +76,7 @@ static device_method_t pcm_davbus_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		davbus_probe),
 	DEVMETHOD(device_attach, 	davbus_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pcm_davbus_driver = {
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 647d66c27bba..2c134f8f97fe 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -109,7 +109,7 @@ static device_method_t pcm_i2s_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		i2s_probe),
 	DEVMETHOD(device_attach, 	i2s_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t pcm_i2s_driver = {
@@ -128,7 +128,7 @@ static device_method_t aoagpio_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		aoagpio_probe),
 	DEVMETHOD(device_attach,	aoagpio_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 struct aoagpio_softc {
diff --git a/sys/dev/sound/macio/onyx.c b/sys/dev/sound/macio/onyx.c
index d13f3da92db6..f4f825a705cc 100644
--- a/sys/dev/sound/macio/onyx.c
+++ b/sys/dev/sound/macio/onyx.c
@@ -80,7 +80,7 @@ static device_method_t onyx_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		onyx_probe),
 	DEVMETHOD(device_attach,	onyx_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t onyx_driver = {
diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c
index 0b31bded928f..f14009f447a8 100644
--- a/sys/dev/sound/macio/snapper.c
+++ b/sys/dev/sound/macio/snapper.c
@@ -106,7 +106,7 @@ static device_method_t snapper_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		snapper_probe),
 	DEVMETHOD(device_attach,	snapper_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t snapper_driver = {
diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c
index 505fb7ba15b1..bd40ea6b4f6b 100644
--- a/sys/dev/sound/macio/tumbler.c
+++ b/sys/dev/sound/macio/tumbler.c
@@ -106,7 +106,7 @@ static device_method_t tumbler_methods[] = {
 	/* Device interface. */
 	DEVMETHOD(device_probe,		tumbler_probe),
 	DEVMETHOD(device_attach,	tumbler_attach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t tumbler_driver = {
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index aea7cc6d3a64..c6cbd61c927c 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -925,7 +925,7 @@ static device_method_t als_methods[] = {
 	DEVMETHOD(device_detach,	als_pci_detach),
 	DEVMETHOD(device_suspend,	als_pci_suspend),
 	DEVMETHOD(device_resume,	als_pci_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t als_driver = {
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index 0d2228ee16cd..39ef2f375328 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1402,7 +1402,7 @@ static device_method_t atiixp_methods[] = {
 	DEVMETHOD(device_detach,	atiixp_pci_detach),
 	DEVMETHOD(device_suspend,	atiixp_pci_suspend),
 	DEVMETHOD(device_resume,	atiixp_pci_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t atiixp_driver = {
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index b5465fed5a8b..4ff58cb04b8e 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -1095,7 +1095,7 @@ static device_method_t cmi_methods[] = {
 	DEVMETHOD(device_detach,        cmi_detach),
 	DEVMETHOD(device_resume,        cmi_resume),
 	DEVMETHOD(device_suspend,       cmi_suspend),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cmi_driver = {
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index eecfc740bb3f..9899e7409212 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -954,7 +954,7 @@ static device_method_t cs4281_methods[] = {
     DEVMETHOD(device_detach,		cs4281_pci_detach),
     DEVMETHOD(device_suspend,		cs4281_pci_suspend),
     DEVMETHOD(device_resume,		cs4281_pci_resume),
-    { 0, 0 }
+    DEVMETHOD_END
 };
 
 static driver_t cs4281_driver = {
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 688aee6400d8..32c0603f78a2 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -1024,7 +1024,7 @@ static device_method_t pcmcsa_methods[] = {
 	DEVMETHOD(device_suspend, pcmcsa_suspend),
 	DEVMETHOD(device_resume, pcmcsa_resume),
 
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t pcmcsa_driver = {
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 50864a9067fd..5b74c5646a1c 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -2673,7 +2673,7 @@ static device_method_t envy24_methods[] = {
 	DEVMETHOD(device_probe,		envy24_pci_probe),
 	DEVMETHOD(device_attach,	envy24_pci_attach),
 	DEVMETHOD(device_detach,	envy24_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t envy24_driver = {
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 3aca8f92f708..aacd2b33040c 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -2567,7 +2567,7 @@ static device_method_t envy24ht_methods[] = {
 	DEVMETHOD(device_probe,		envy24ht_pci_probe),
 	DEVMETHOD(device_attach,	envy24ht_pci_attach),
 	DEVMETHOD(device_detach,	envy24ht_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t envy24ht_driver = {
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 45b953efc3fc..ab8a6db74640 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1925,7 +1925,7 @@ static device_method_t es_methods[] = {
 	DEVMETHOD(device_probe,		es_pci_probe),
 	DEVMETHOD(device_attach,	es_pci_attach),
 	DEVMETHOD(device_detach,	es_pci_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t es_driver = {
diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c
index 5a8f2ab57d6c..93ee576a3a67 100644
--- a/sys/dev/sound/pci/hdsp-pcm.c
+++ b/sys/dev/sound/pci/hdsp-pcm.c
@@ -1118,7 +1118,7 @@ static device_method_t hdsp_pcm_methods[] = {
 	DEVMETHOD(device_probe,     hdsp_pcm_probe),
 	DEVMETHOD(device_attach,    hdsp_pcm_attach),
 	DEVMETHOD(device_detach,    hdsp_pcm_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hdsp_pcm_driver = {
diff --git a/sys/dev/sound/pci/hdsp.c b/sys/dev/sound/pci/hdsp.c
index aefbb71807b6..4fd3647edf51 100644
--- a/sys/dev/sound/pci/hdsp.c
+++ b/sys/dev/sound/pci/hdsp.c
@@ -1009,7 +1009,7 @@ static device_method_t hdsp_methods[] = {
 	DEVMETHOD(device_attach,    hdsp_attach),
 	DEVMETHOD(device_detach,    hdsp_detach),
 	DEVMETHOD(bus_child_deleted, hdsp_child_deleted),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hdsp_driver = {
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index 0ccdf69c32ee..0daa8fa8bb92 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -1109,7 +1109,7 @@ static device_method_t hdspe_pcm_methods[] = {
 	DEVMETHOD(device_probe,     hdspe_pcm_probe),
 	DEVMETHOD(device_attach,    hdspe_pcm_attach),
 	DEVMETHOD(device_detach,    hdspe_pcm_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hdspe_pcm_driver = {
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index f468111cb16e..d08b42df0d82 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -901,7 +901,7 @@ static device_method_t hdspe_methods[] = {
 	DEVMETHOD(device_attach,    hdspe_attach),
 	DEVMETHOD(device_detach,    hdspe_detach),
 	DEVMETHOD(bus_child_deleted, hdspe_child_deleted),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t hdspe_driver = {
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 7e7fe95dac8c..1295e7eb5bc1 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -1226,7 +1226,7 @@ static device_method_t ich_methods[] = {
 	DEVMETHOD(device_detach,	ich_pci_detach),
 	DEVMETHOD(device_suspend, 	ich_pci_suspend),
 	DEVMETHOD(device_resume,	ich_pci_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ich_driver = {
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index a8a52601d1a2..d6e1d0179225 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1779,7 +1779,7 @@ static device_method_t m3_methods[] = {
 	DEVMETHOD(device_suspend,       m3_pci_suspend),
 	DEVMETHOD(device_resume,        m3_pci_resume),
 	DEVMETHOD(device_shutdown,      m3_pci_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t m3_driver = {
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 1fee943d9364..9268ce722c5b 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -808,7 +808,7 @@ static device_method_t nm_methods[] = {
 	DEVMETHOD(device_detach,	nm_pci_detach),
 	DEVMETHOD(device_suspend,	nm_pci_suspend),
 	DEVMETHOD(device_resume,	nm_pci_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t nm_driver = {
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index 2b61b594a8f3..87df94b914b5 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1060,7 +1060,7 @@ static device_method_t ess_methods[] = {
 	DEVMETHOD(device_detach,	ess_detach),
 	DEVMETHOD(device_resume,	ess_resume),
 	DEVMETHOD(device_suspend,	ess_suspend),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ess_driver = {
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 1b659118b840..53388353d15a 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -1024,7 +1024,7 @@ static device_method_t tr_methods[] = {
 	DEVMETHOD(device_detach,	tr_pci_detach),
 	DEVMETHOD(device_suspend,	tr_pci_suspend),
 	DEVMETHOD(device_resume,	tr_pci_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t tr_driver = {
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 1b7353464503..648370c6c973 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -923,12 +923,12 @@ sv_detach(device_t dev) {
 }
 
 static device_method_t sc_methods[] = {
-        DEVMETHOD(device_probe,         sv_probe),
-        DEVMETHOD(device_attach,        sv_attach),
-        DEVMETHOD(device_detach,        sv_detach),
-        DEVMETHOD(device_resume,        sv_resume),
-        DEVMETHOD(device_suspend,       sv_suspend),
-        { 0, 0 }
+	DEVMETHOD(device_probe,         sv_probe),
+	DEVMETHOD(device_attach,        sv_attach),
+	DEVMETHOD(device_detach,        sv_detach),
+	DEVMETHOD(device_resume,        sv_resume),
+	DEVMETHOD(device_suspend,       sv_suspend),
+	DEVMETHOD_END
 };
 
 static driver_t sonicvibes_driver = {
diff --git a/sys/dev/spibus/spigen.c b/sys/dev/spibus/spigen.c
index 39b94c6123fc..94f276d239f3 100644
--- a/sys/dev/spibus/spigen.c
+++ b/sys/dev/spibus/spigen.c
@@ -381,7 +381,7 @@ static device_method_t spigen_methods[] = {
 	DEVMETHOD(device_probe,		spigen_probe),
 	DEVMETHOD(device_attach,	spigen_attach),
 	DEVMETHOD(device_detach,	spigen_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t spigen_driver = {
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index d73ec841f333..98b32e353c93 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -83,7 +83,7 @@ static device_method_t tdfx_methods[] = {
 	DEVMETHOD(device_attach,	tdfx_attach),
 	DEVMETHOD(device_detach,	tdfx_detach),
 	DEVMETHOD(device_shutdown,	tdfx_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerators");
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 14f7d353303f..d6d5adda7a41 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -261,7 +261,7 @@ static device_method_t ti_methods[] = {
 	DEVMETHOD(device_attach,	ti_attach),
 	DEVMETHOD(device_detach,	ti_detach),
 	DEVMETHOD(device_shutdown,	ti_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t ti_driver = {
diff --git a/sys/dev/tpm/tpm_acpi.c b/sys/dev/tpm/tpm_acpi.c
index 1c7bb9a0175b..4d52b2952dd3 100644
--- a/sys/dev/tpm/tpm_acpi.c
+++ b/sys/dev/tpm/tpm_acpi.c
@@ -68,7 +68,7 @@ static device_method_t tpm_acpi_methods[] = {
 	DEVMETHOD(device_detach,	tpm_detach),
 	DEVMETHOD(device_suspend,	tpm_suspend),
 	DEVMETHOD(device_resume,	tpm_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t tpm_acpi_driver = {
diff --git a/sys/dev/tpm/tpm_isa.c b/sys/dev/tpm/tpm_isa.c
index 311246c16b49..6bb039c5af87 100644
--- a/sys/dev/tpm/tpm_isa.c
+++ b/sys/dev/tpm/tpm_isa.c
@@ -81,7 +81,7 @@ static device_method_t tpm_methods[] = {
 	DEVMETHOD(device_detach,	tpm_detach),
 	DEVMETHOD(device_suspend,	tpm_suspend),
 	DEVMETHOD(device_resume,	tpm_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t tpm_driver = {
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index bd53bfb204ed..b75c8a9ad517 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -49,7 +49,7 @@ static device_method_t uart_acpi_methods[] = {
 	DEVMETHOD(device_attach,	uart_bus_attach),
 	DEVMETHOD(device_detach,	uart_bus_detach),
 	DEVMETHOD(device_resume,	uart_bus_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uart_acpi_driver = {
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index e9a7e04e4e0c..957638548880 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -54,7 +54,7 @@ static device_method_t uart_fdt_methods[] = {
 	DEVMETHOD(device_probe,		uart_fdt_probe),
 	DEVMETHOD(device_attach,	uart_bus_attach),
 	DEVMETHOD(device_detach,	uart_bus_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uart_fdt_driver = {
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 27211a1334c0..166f25599d4c 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -49,7 +49,7 @@ static device_method_t uart_isa_methods[] = {
 	DEVMETHOD(device_attach,	uart_bus_attach),
 	DEVMETHOD(device_detach,	uart_bus_detach),
 	DEVMETHOD(device_resume,	uart_bus_resume),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uart_isa_driver = {
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index 5f6c5cdbbdad..661db8595262 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -52,7 +52,7 @@ static device_method_t uart_puc_methods[] = {
 	/* Serdev interface */
 	DEVMETHOD(serdev_ihand,		uart_bus_ihand),
 	DEVMETHOD(serdev_ipend,		uart_bus_ipend),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uart_puc_driver = {
diff --git a/sys/dev/uart/uart_bus_scc.c b/sys/dev/uart/uart_bus_scc.c
index 731c1532851a..ad826dfe80d4 100644
--- a/sys/dev/uart/uart_bus_scc.c
+++ b/sys/dev/uart/uart_bus_scc.c
@@ -53,7 +53,7 @@ static device_method_t uart_scc_methods[] = {
 	/* Serdev interface */
 	DEVMETHOD(serdev_ihand,		uart_bus_ihand),
 	DEVMETHOD(serdev_sysdev,	uart_bus_sysdev),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uart_scc_driver = {
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index b40012a313ca..021475ecc676 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -296,7 +296,7 @@ static kobj_method_t imx_uart_methods[] = {
 	KOBJMETHOD(uart_transmit,	imx_uart_bus_transmit),
 	KOBJMETHOD(uart_grab,		imx_uart_bus_grab),
 	KOBJMETHOD(uart_ungrab,		imx_uart_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 static struct uart_class uart_imx_class = {
diff --git a/sys/dev/uart/uart_dev_lowrisc.c b/sys/dev/uart/uart_dev_lowrisc.c
index 19630deb4b78..ef70118a817a 100644
--- a/sys/dev/uart/uart_dev_lowrisc.c
+++ b/sys/dev/uart/uart_dev_lowrisc.c
@@ -168,7 +168,7 @@ static kobj_method_t lowrisc_uart_methods[] = {
 	KOBJMETHOD(uart_transmit,	lowrisc_uart_bus_transmit),
 	KOBJMETHOD(uart_grab,		lowrisc_uart_bus_grab),
 	KOBJMETHOD(uart_ungrab,		lowrisc_uart_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 static struct uart_class uart_lowrisc_class = {
diff --git a/sys/dev/uart/uart_dev_mu.c b/sys/dev/uart/uart_dev_mu.c
index ddaca2edce2c..abfb105f6c9c 100644
--- a/sys/dev/uart/uart_dev_mu.c
+++ b/sys/dev/uart/uart_dev_mu.c
@@ -280,7 +280,7 @@ static kobj_method_t uart_mu_methods[] = {
 	KOBJMETHOD(uart_transmit,	uart_mu_bus_transmit),
 	KOBJMETHOD(uart_grab,		uart_mu_bus_grab),
 	KOBJMETHOD(uart_ungrab,		uart_mu_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 static struct uart_class uart_mu_class = {
diff --git a/sys/dev/uart/uart_dev_mvebu.c b/sys/dev/uart/uart_dev_mvebu.c
index 8f989aa0ca14..a4d331bea6c0 100644
--- a/sys/dev/uart/uart_dev_mvebu.c
+++ b/sys/dev/uart/uart_dev_mvebu.c
@@ -299,7 +299,7 @@ static kobj_method_t uart_mvebu_methods[] = {
 	KOBJMETHOD(uart_transmit,	uart_mvebu_bus_transmit),
 	KOBJMETHOD(uart_grab,		uart_mvebu_bus_grab),
 	KOBJMETHOD(uart_ungrab,		uart_mvebu_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 struct uart_class uart_mvebu_class = {
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
index 6afc693cd347..ae3c4d3218cf 100644
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -367,7 +367,7 @@ static kobj_method_t uart_pl011_methods[] = {
 	KOBJMETHOD(uart_transmit,	uart_pl011_bus_transmit),
 	KOBJMETHOD(uart_grab,		uart_pl011_bus_grab),
 	KOBJMETHOD(uart_ungrab,		uart_pl011_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 static struct uart_class uart_pl011_class = {
diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c
index d6a8846b874e..84d040f64942 100644
--- a/sys/dev/uart/uart_dev_quicc.c
+++ b/sys/dev/uart/uart_dev_quicc.c
@@ -261,7 +261,7 @@ static kobj_method_t quicc_methods[] = {
 	KOBJMETHOD(uart_transmit,	quicc_bus_transmit),
 	KOBJMETHOD(uart_grab,		quicc_bus_grab),
 	KOBJMETHOD(uart_ungrab,		quicc_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 struct uart_class uart_quicc_class = {
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c
index 45bf63f20bb2..56d9c96cd31a 100644
--- a/sys/dev/uart/uart_dev_z8530.c
+++ b/sys/dev/uart/uart_dev_z8530.c
@@ -297,7 +297,7 @@ static kobj_method_t z8530_methods[] = {
 	KOBJMETHOD(uart_transmit,	z8530_bus_transmit),
 	KOBJMETHOD(uart_grab,		z8530_bus_grab),
 	KOBJMETHOD(uart_ungrab,		z8530_bus_ungrab),
-	{ 0, 0 }
+	KOBJMETHOD_END
 };
 
 struct uart_class uart_z8530_class = {
diff --git a/sys/dev/ufshci/ufshci_pci.c b/sys/dev/ufshci/ufshci_pci.c
index 6a4182a55a7d..606f2a095576 100644
--- a/sys/dev/ufshci/ufshci_pci.c
+++ b/sys/dev/ufshci/ufshci_pci.c
@@ -34,7 +34,8 @@ static device_method_t ufshci_pci_methods[] = {
 	DEVMETHOD(device_attach, ufshci_pci_attach),
 	DEVMETHOD(device_detach, ufshci_pci_detach),
 	DEVMETHOD(device_suspend, ufshci_pci_suspend),
-	DEVMETHOD(device_resume, ufshci_pci_resume), { 0, 0 }
+	DEVMETHOD(device_resume, ufshci_pci_resume),
+	DEVMETHOD_END
 };
 
 static driver_t ufshci_pci_driver = {
diff --git a/sys/dev/usb/controller/ehci_fsl.c b/sys/dev/usb/controller/ehci_fsl.c
index ce1749775ab2..a359908fd5f4 100644
--- a/sys/dev/usb/controller/ehci_fsl.c
+++ b/sys/dev/usb/controller/ehci_fsl.c
@@ -80,7 +80,7 @@ static device_method_t ehci_methods[] = {
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 /* kobj_class definition */
diff --git a/sys/dev/usb/input/uep.c b/sys/dev/usb/input/uep.c
index 25eeb450491d..d54efe9cea2c 100644
--- a/sys/dev/usb/input/uep.c
+++ b/sys/dev/usb/input/uep.c
@@ -517,9 +517,9 @@ uep_close(struct usb_fifo *fifo, int fflags)
 
 static device_method_t uep_methods[] = {
 	DEVMETHOD(device_probe, uep_probe),
-       	DEVMETHOD(device_attach, uep_attach),
+	DEVMETHOD(device_attach, uep_attach),
 	DEVMETHOD(device_detach, uep_detach),
-	{ 0, 0 },
+	DEVMETHOD_END
 };
 
 static driver_t uep_driver = {
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index 24135f6ccd5a..16c182fcbd41 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -484,7 +484,7 @@ static device_method_t uhso_methods[] = {
 	DEVMETHOD(device_probe,		uhso_probe),
 	DEVMETHOD(device_attach,	uhso_attach),
 	DEVMETHOD(device_detach,	uhso_detach),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t uhso_driver = {
diff --git a/sys/dev/xilinx/if_xae.c b/sys/dev/xilinx/if_xae.c
index 435902dc3c10..ee444749e9fc 100644
--- a/sys/dev/xilinx/if_xae.c
+++ b/sys/dev/xilinx/if_xae.c
@@ -1357,7 +1357,7 @@ static device_method_t xae_methods[] = {
 	DEVMETHOD(miibus_readreg,	xae_miibus_read_reg),
 	DEVMETHOD(miibus_writereg,	xae_miibus_write_reg),
 	DEVMETHOD(miibus_statchg,	xae_miibus_statchg),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 driver_t xae_driver = {