Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2026 16:51:13 +0000
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1633c00828ac - stable/14 - chore: replace {0, 0} with {DEV,KOBJ}METHOD_END
Message-ID:  <69ecf101.4730f.54a398c7@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/14 has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=1633c00828ac84fc5f9c08e5445fb6e6ead1939c

commit 1633c00828ac84fc5f9c08e5445fb6e6ead1939c
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-02-21 06:14:46 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-04-25 16:50:07 +0000

    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
    
    MFC notes:
            All conflicts were dropped as they didn't apply to code in branch.
    
    Conflicts:
            sys/dev/flash/w25n.c
            sys/dev/nvd/nvd.c
            sys/dev/nvme/nvme_sim.c
            sys/dev/sound/pci/hdsp-pcm.c
            sys/dev/sound/pci/hdsp.c
            sys/dev/ufshci/ufshci_pci.c
    
    (cherry picked from commit 0fc6c3f731a2cca3120798806c330a3081c9424b)
---
 sys/dev/aacraid/aacraid_cam.c                     |  2 +-
 sys/dev/aacraid/aacraid_pci.c                     |  2 +-
 sys/dev/acpi_support/acpi_asus.c                  |  2 +-
 sys/dev/acpica/acpi_video.c                       |  2 +-
 sys/dev/adb/adb_bus.c                             | 12 ++++++------
 sys/dev/adb/adb_buttons.c                         |  2 +-
 sys/dev/adb/adb_kbd.c                             |  2 +-
 sys/dev/adb/adb_mouse.c                           |  2 +-
 sys/dev/agp/agp_ali.c                             |  2 +-
 sys/dev/agp/agp_amd.c                             |  2 +-
 sys/dev/agp/agp_amd64.c                           |  2 +-
 sys/dev/agp/agp_apple.c                           |  2 +-
 sys/dev/agp/agp_ati.c                             |  2 +-
 sys/dev/agp/agp_i810.c                            |  2 +-
 sys/dev/agp/agp_intel.c                           |  2 +-
 sys/dev/agp/agp_nvidia.c                          |  2 +-
 sys/dev/agp/agp_sis.c                             |  2 +-
 sys/dev/agp/agp_via.c                             |  2 +-
 sys/dev/aic7xxx/ahc_isa.c                         |  2 +-
 sys/dev/aic7xxx/ahc_pci.c                         |  2 +-
 sys/dev/aic7xxx/ahd_pci.c                         |  2 +-
 sys/dev/al_eth/al_eth.c                           |  2 +-
 sys/dev/alpm/alpm.c                               |  2 +-
 sys/dev/amdpm/amdpm.c                             |  2 +-
 sys/dev/amdsmb/amdsmb.c                           |  2 +-
 sys/dev/asmc/asmc.c                               |  2 +-
 sys/dev/atkbdc/atkbd_atkbdc.c                     |  2 +-
 sys/dev/atkbdc/atkbdc_isa.c                       |  2 +-
 sys/dev/atkbdc/psm.c                              |  4 ++--
 sys/dev/axgbe/if_axgbe.c                          |  4 ++--
 sys/dev/cfe/cfe_resource.c                        |  2 +-
 sys/dev/cfi/cfi_disk.c                            |  2 +-
 sys/dev/chromebook_platform/chromebook_platform.c |  2 +-
 sys/dev/ciss/ciss.c                               |  2 +-
 sys/dev/cxgb/cxgb_main.c                          |  2 +-
 sys/dev/cxgbe/cxgbei/icl_cxgbei.c                 |  2 +-
 sys/dev/cxgbe/t4_main.c                           |  4 ++--
 sys/dev/dcons/dcons_crom.c                        |  2 +-
 sys/dev/dpaa/bman_fdt.c                           |  4 ++--
 sys/dev/dpaa/fman_fdt.c                           |  2 +-
 sys/dev/dpaa/fman_mdio.c                          |  2 +-
 sys/dev/dpaa/if_dtsec_fdt.c                       |  2 +-
 sys/dev/dpaa/qman_fdt.c                           |  4 ++--
 sys/dev/dpms/dpms.c                               |  2 +-
 sys/dev/dwc/if_dwc.c                              |  2 +-
 sys/dev/fb/fbd.c                                  |  2 +-
 sys/dev/fdc/fdc.c                                 |  2 +-
 sys/dev/fdc/fdc_isa.c                             |  2 +-
 sys/dev/firewire/if_fwe.c                         |  2 +-
 sys/dev/firewire/if_fwip.c                        |  2 +-
 sys/dev/firewire/sbp.c                            |  2 +-
 sys/dev/firewire/sbp_targ.c                       |  2 +-
 sys/dev/flash/cqspi.c                             |  2 +-
 sys/dev/flash/flexspi/flex_spi.c                  |  2 +-
 sys/dev/flash/mx25l.c                             |  2 +-
 sys/dev/flash/n25q.c                              |  2 +-
 sys/dev/ftwd/ftwd.c                               |  2 +-
 sys/dev/fxp/inphy.c                               |  2 +-
 sys/dev/glxiic/glxiic.c                           |  2 +-
 sys/dev/gpio/dwgpio/dwgpio.c                      |  2 +-
 sys/dev/hpt27xx/hpt27xx_osm_bsd.c                 |  2 +-
 sys/dev/hptiop/hptiop.c                           |  2 +-
 sys/dev/hptnr/hptnr_osm_bsd.c                     |  2 +-
 sys/dev/hyperv/input/hv_kbdc.c                    |  2 +-
 sys/dev/hyperv/utilities/hv_kvp.c                 |  2 +-
 sys/dev/hyperv/utilities/hv_snapshot.c            |  2 +-
 sys/dev/ida/ida_disk.c                            |  2 +-
 sys/dev/iicbus/adc/ad7417.c                       |  2 +-
 sys/dev/iicbus/controller/twsi/a10_twsi.c         |  2 +-
 sys/dev/iicbus/controller/twsi/twsi.c             |  2 +-
 sys/dev/iicbus/if_ic.c                            |  2 +-
 sys/dev/iicbus/iic.c                              |  2 +-
 sys/dev/iicbus/iicbb.c                            |  2 +-
 sys/dev/iicbus/pwm/adt746x.c                      |  2 +-
 sys/dev/iicbus/sensor/ds1631.c                    |  2 +-
 sys/dev/iicbus/sensor/ds1775.c                    |  2 +-
 sys/dev/iicbus/sensor/max6690.c                   |  2 +-
 sys/dev/ipmi/ipmi_acpi.c                          |  2 +-
 sys/dev/ipmi/ipmi_isa.c                           |  2 +-
 sys/dev/ipmi/ipmi_pci.c                           |  4 ++--
 sys/dev/ipmi/ipmi_smbus.c                         |  2 +-
 sys/dev/ips/ips_disk.c                            |  2 +-
 sys/dev/isci/isci.c                               |  2 +-
 sys/dev/iscsi/icl_soft.c                          |  2 +-
 sys/dev/iser/icl_iser.c                           |  2 +-
 sys/dev/isp/isp_pci.c                             |  2 +-
 sys/dev/itwd/itwd.c                               |  2 +-
 sys/dev/le/if_le_isa.c                            |  2 +-
 sys/dev/le/if_le_pci.c                            |  2 +-
 sys/dev/mfi/mfi_disk.c                            |  2 +-
 sys/dev/mfi/mfi_syspd.c                           |  2 +-
 sys/dev/mge/if_mge.c                              |  2 +-
 sys/dev/mlx/mlx_disk.c                            |  2 +-
 sys/dev/mpi3mr/mpi3mr_pci.c                       |  2 +-
 sys/dev/mpr/mpr_pci.c                             |  2 +-
 sys/dev/mvs/mvs.c                                 |  2 +-
 sys/dev/mvs/mvs_pci.c                             |  2 +-
 sys/dev/mvs/mvs_soc.c                             |  2 +-
 sys/dev/ncthwm/ncthwm.c                           |  2 +-
 sys/dev/nfsmb/nfsmb.c                             |  4 ++--
 sys/dev/nvme/nvme_ahci.c                          |  2 +-
 sys/dev/nvme/nvme_pci.c                           |  2 +-
 sys/dev/ow/ow.c                                   |  2 +-
 sys/dev/ow/ow_temp.c                              |  2 +-
 sys/dev/ow/owc_gpiobus.c                          |  2 +-
 sys/dev/pbio/pbio.c                               |  2 +-
 sys/dev/pcf/pcf_isa.c                             |  2 +-
 sys/dev/pci/fixup_pci.c                           |  2 +-
 sys/dev/pci/hostb_pci.c                           |  2 +-
 sys/dev/pci/ignore_pci.c                          |  2 +-
 sys/dev/pci/vga_pci.c                             |  2 +-
 sys/dev/pms/freebsd/driver/ini/src/agtiapi.c      |  2 +-
 sys/dev/powermac_nvram/powermac_nvram.c           |  2 +-
 sys/dev/ppbus/if_plip.c                           |  2 +-
 sys/dev/ppbus/lpt.c                               |  2 +-
 sys/dev/ppbus/pcfclock.c                          |  2 +-
 sys/dev/ppbus/ppbconf.c                           |  2 +-
 sys/dev/ppbus/ppi.c                               |  2 +-
 sys/dev/ppbus/pps.c                               |  2 +-
 sys/dev/ppc/ppc_acpi.c                            |  2 +-
 sys/dev/ppc/ppc_isa.c                             |  2 +-
 sys/dev/ppc/ppc_pci.c                             |  2 +-
 sys/dev/ppc/ppc_puc.c                             |  2 +-
 sys/dev/pst/pst-pci.c                             |  2 +-
 sys/dev/pst/pst-raid.c                            |  2 +-
 sys/dev/qlnx/qlnxe/qlnx_os.c                      |  4 ++--
 sys/dev/qlxgb/qla_os.c                            |  2 +-
 sys/dev/qlxgbe/ql_os.c                            |  2 +-
 sys/dev/qlxge/qls_os.c                            |  2 +-
 sys/dev/sbni/if_sbni_isa.c                        |  2 +-
 sys/dev/sbni/if_sbni_pci.c                        |  2 +-
 sys/dev/siis/siis.c                               |  4 ++--
 sys/dev/smartpqi/smartpqi_main.c                  |  2 +-
 sys/dev/smbios/smbios.c                           |  2 +-
 sys/dev/smbus/smb.c                               |  2 +-
 sys/dev/smc/if_smc.c                              |  2 +-
 sys/dev/smc/if_smc_acpi.c                         |  2 +-
 sys/dev/smc/if_smc_fdt.c                          |  2 +-
 sys/dev/sound/macio/davbus.c                      |  2 +-
 sys/dev/sound/macio/i2s.c                         |  4 ++--
 sys/dev/sound/macio/onyx.c                        |  2 +-
 sys/dev/sound/macio/snapper.c                     |  2 +-
 sys/dev/sound/macio/tumbler.c                     |  2 +-
 sys/dev/sound/pci/als4000.c                       |  2 +-
 sys/dev/sound/pci/atiixp.c                        |  2 +-
 sys/dev/sound/pci/cmi.c                           |  2 +-
 sys/dev/sound/pci/cs4281.c                        |  2 +-
 sys/dev/sound/pci/csapcm.c                        |  2 +-
 sys/dev/sound/pci/envy24.c                        |  2 +-
 sys/dev/sound/pci/envy24ht.c                      |  2 +-
 sys/dev/sound/pci/es137x.c                        |  2 +-
 sys/dev/sound/pci/hdspe-pcm.c                     |  2 +-
 sys/dev/sound/pci/hdspe.c                         |  2 +-
 sys/dev/sound/pci/ich.c                           |  2 +-
 sys/dev/sound/pci/maestro3.c                      |  2 +-
 sys/dev/sound/pci/neomagic.c                      |  2 +-
 sys/dev/sound/pci/solo.c                          |  2 +-
 sys/dev/sound/pci/t4dwave.c                       |  2 +-
 sys/dev/sound/pci/vibes.c                         | 12 ++++++------
 sys/dev/spibus/spigen.c                           |  2 +-
 sys/dev/tdfx/tdfx_pci.c                           |  2 +-
 sys/dev/ti/if_ti.c                                |  2 +-
 sys/dev/tpm/tpm_acpi.c                            |  2 +-
 sys/dev/tpm/tpm_isa.c                             |  2 +-
 sys/dev/uart/uart_bus_acpi.c                      |  2 +-
 sys/dev/uart/uart_bus_fdt.c                       |  2 +-
 sys/dev/uart/uart_bus_isa.c                       |  2 +-
 sys/dev/uart/uart_bus_puc.c                       |  2 +-
 sys/dev/uart/uart_bus_scc.c                       |  2 +-
 sys/dev/uart/uart_dev_imx.c                       |  2 +-
 sys/dev/uart/uart_dev_lowrisc.c                   |  2 +-
 sys/dev/uart/uart_dev_mu.c                        |  2 +-
 sys/dev/uart/uart_dev_mvebu.c                     |  2 +-
 sys/dev/uart/uart_dev_pl011.c                     |  2 +-
 sys/dev/uart/uart_dev_quicc.c                     |  2 +-
 sys/dev/uart/uart_dev_z8530.c                     |  2 +-
 sys/dev/usb/controller/ehci_fsl.c                 |  2 +-
 sys/dev/usb/input/uep.c                           |  4 ++--
 sys/dev/usb/net/uhso.c                            |  2 +-
 sys/dev/xilinx/if_xae.c                           |  2 +-
 180 files changed, 201 insertions(+), 201 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 da7c2a4d19cb..e3ec70b70ef1 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 144cce51b9f4..269e737b8597 100644
--- a/sys/dev/adb/adb_bus.c
+++ b/sys/dev/adb/adb_bus.c
@@ -58,15 +58,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 911d952ee52a..494b71375413 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -100,7 +100,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 464cf2b1f862..32e54df23f12 100644
--- a/sys/dev/adb/adb_mouse.c
+++ b/sys/dev/adb/adb_mouse.c
@@ -105,7 +105,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 0762d903fffe..31704aa60813 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -254,7 +254,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 b2dc6527392d..c87ec0d11b66 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -391,7 +391,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 9b5a4c342dac..a0b91428a5b5 100644
--- a/sys/dev/agp/agp_amd64.c
+++ b/sys/dev/agp/agp_amd64.c
@@ -499,7 +499,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 ee22f1cc44fa..13730bcc619e 100644
--- a/sys/dev/agp/agp_apple.c
+++ b/sys/dev/agp/agp_apple.c
@@ -279,7 +279,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 b30d80038a3d..649a851ba9ad 100644
--- a/sys/dev/agp/agp_ati.c
+++ b/sys/dev/agp/agp_ati.c
@@ -363,7 +363,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 6ed04297f6c8..4325274f4855 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 32b3e920adf5..1766ecc74097 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -420,7 +420,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 f7572e487658..4b2804782a6e 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -274,7 +274,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 f101c08e8cc3..5ee0a9e13cee 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -409,7 +409,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 06ef509f2782..456ada6c2879 100644
--- a/sys/dev/aic7xxx/ahc_isa.c
+++ b/sys/dev/aic7xxx/ahc_isa.c
@@ -286,7 +286,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 6911f167c081..ed14cdfa0d2a 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -42,7 +42,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 ec828517c1c4..04eb89ec21a5 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -42,7 +42,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 1b976e7a724c..b799e4233247 100644
--- a/sys/dev/al_eth/al_eth.c
+++ b/sys/dev/al_eth/al_eth.c
@@ -243,7 +243,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 cde535d5868c..44bf9c5f11ba 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 660e0b2d04b8..21b47c112d1b 100644
--- a/sys/dev/amdpm/amdpm.c
+++ b/sys/dev/amdpm/amdpm.c
@@ -649,7 +649,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 c29af735ffce..d39e8519ff25 100644
--- a/sys/dev/amdsmb/amdsmb.c
+++ b/sys/dev/amdsmb/amdsmb.c
@@ -561,7 +561,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 4bba16fa6a89..17a282ce0b97 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -581,7 +581,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 cb42c8bda40c..65b4312c33aa 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 6b6a24ba7f31..41905164ca6a 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -733,7 +733,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 = {
@@ -7510,7 +7510,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 9c6d7d845f2d..36b053971552 100644
--- a/sys/dev/axgbe/if_axgbe.c
+++ b/sys/dev/axgbe/if_axgbe.c
@@ -560,7 +560,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,
@@ -603,7 +603,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 062d739c3f8f..629f655f4fbd 100644
--- a/sys/dev/cfe/cfe_resource.c
+++ b/sys/dev/cfe/cfe_resource.c
@@ -145,7 +145,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 573dece03f5a..653f1d2dfdeb 100644
--- a/sys/dev/cfi/cfi_disk.c
+++ b/sys/dev/cfi/cfi_disk.c
@@ -347,7 +347,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 533556fa17ce..9218d730fdc0 100644
--- a/sys/dev/chromebook_platform/chromebook_platform.c
+++ b/sys/dev/chromebook_platform/chromebook_platform.c
@@ -83,7 +83,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 36030dd86eef..14818db93ee4 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 4fc07dc126a1..c7ddb3962a7a 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 89b3628bae6d..0058e5185b9e 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 537249c8e5c3..c3a73bdfe994 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -131,7 +131,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",
@@ -147,7 +147,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 2ff695bf7d89..8f117cacd663 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 8fb06924e10a..82c4e80eb1e4 100644
--- a/sys/dev/dpaa/fman_fdt.c
+++ b/sys/dev/dpaa/fman_fdt.c
@@ -57,7 +57,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 82e65cacda48..91e2248a3b11 100644
--- a/sys/dev/dpaa/fman_mdio.c
+++ b/sys/dev/dpaa/fman_mdio.c
@@ -91,7 +91,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 f2f61777fbec..4bab2aa2b481 100644
--- a/sys/dev/dpaa/if_dtsec_fdt.c
+++ b/sys/dev/dpaa/if_dtsec_fdt.c
@@ -78,7 +78,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 fac845c8f2b5..15b8d16f59ba 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 47eb9d03c820..5ed4b5a86a6d 100644
--- a/sys/dev/dpms/dpms.c
+++ b/sys/dev/dpms/dpms.c
@@ -107,7 +107,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 147b6351a9f8..158bb04f3de0 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -1809,7 +1809,7 @@ static device_method_t dwc_methods[] = {
 	DEVMETHOD(miibus_writereg,	dwc_miibus_write_reg),
 	DEVMETHOD(miibus_statchg,	dwc_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 cbd6c3de4cd8..48532b9daf32 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -349,7 +349,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 c51d36baaecb..0cb2896c09e8 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -2090,7 +2090,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 fcdd6bc0cdd5..e206d9fcb932 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -211,7 +211,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 5f4ebb747057..24746ce4f137 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 9332ec85477c..417aa231e4ba 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 b4c2ce985e08..f845a1d8afc2 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),
 
*** 1688 LINES SKIPPED ***


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ecf101.4730f.54a398c7>