From d3c9c58ee7215956b01a6764f73d9b1f21812b6e Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 20 Feb 2013 08:08:39 +0100 Subject: [PATCH] kernel: Use DEVMETHOD_END in the drivers. --- sys/bus/firewire/firewire.c | 2 +- sys/bus/firewire/fwohci_pci.c | 2 +- sys/bus/iicbus/iic.c | 2 +- sys/bus/iicbus/iicbb.c | 2 +- sys/bus/iicbus/iicbus.c | 2 +- sys/bus/iicbus/iicsmb.c | 2 +- sys/bus/iicbus/pcf/pcf.c | 2 +- sys/bus/isa/isa_common.c | 2 +- sys/bus/isa/isahint.c | 2 +- sys/bus/isa/pnp.c | 2 +- sys/bus/isa/pnpeat.c | 2 +- sys/bus/isa/syscons_isa.c | 2 +- sys/bus/isa/vga_isa.c | 2 +- sys/bus/mmc/mmc.c | 2 +- sys/bus/pccard/pccard.c | 2 +- sys/bus/pci/fixup_pci.c | 2 +- sys/bus/pci/hostb_pci.c | 2 +- sys/bus/pci/i386/legacy.c | 4 ++-- sys/bus/pci/i386/mptable_pci.c | 4 ++-- sys/bus/pci/i386/pci_bus.c | 6 +++--- sys/bus/pci/i386/pci_pir.c | 2 +- sys/bus/pci/ignore_pci.c | 2 +- sys/bus/pci/isa_pci.c | 2 +- sys/bus/pci/pci.c | 2 +- sys/bus/pci/pci_compat.c | 2 +- sys/bus/pci/pci_pci.c | 2 +- sys/bus/pci/vga_pci.c | 2 +- sys/bus/pci/x86_64/legacy.c | 4 ++-- sys/bus/pci/x86_64/mptable_pci.c | 4 ++-- sys/bus/pci/x86_64/pci_bus.c | 6 +++--- sys/bus/pci/x86_64/pci_pir.c | 2 +- sys/bus/ppbus/ppbconf.c | 2 +- sys/bus/smbus/smb.c | 2 +- sys/bus/smbus/smbus.c | 5 ++--- sys/bus/u4b/audio/uaudio.c | 2 +- sys/bus/u4b/audio/uaudio_pcm.c | 2 +- sys/bus/u4b/controller/ehci_pci.c | 2 +- sys/bus/u4b/controller/ohci_pci.c | 2 +- sys/bus/u4b/controller/uhci_pci.c | 2 +- sys/bus/u4b/controller/usb_controller.c | 2 +- sys/bus/u4b/controller/xhci_pci.c | 2 +- sys/bus/u4b/input/atp.c | 2 +- sys/bus/u4b/input/uep.c | 2 +- sys/bus/u4b/input/uhid.c | 2 +- sys/bus/u4b/input/ukbd.c | 2 +- sys/bus/u4b/input/ums.c | 2 +- sys/bus/u4b/misc/udbp.c | 2 +- sys/bus/u4b/misc/ufm.c | 2 +- sys/bus/u4b/net/if_axe.c | 2 +- sys/bus/u4b/net/if_cdce.c | 2 +- sys/bus/u4b/net/if_cue.c | 2 +- sys/bus/u4b/net/if_ipheth.c | 2 +- sys/bus/u4b/net/if_kue.c | 2 +- sys/bus/u4b/net/if_udav.c | 2 +- sys/bus/u4b/net/if_usie.c | 2 +- sys/bus/u4b/net/uhso.c | 2 +- sys/bus/u4b/serial/u3g.c | 2 +- sys/bus/u4b/serial/uark.c | 2 +- sys/bus/u4b/serial/ubsa.c | 2 +- sys/bus/u4b/serial/ubser.c | 2 +- sys/bus/u4b/serial/uchcom.c | 2 +- sys/bus/u4b/serial/ucycom.c | 2 +- sys/bus/u4b/serial/ufoma.c | 2 +- sys/bus/u4b/serial/uftdi.c | 2 +- sys/bus/u4b/serial/ugensa.c | 2 +- sys/bus/u4b/serial/uipaq.c | 2 +- sys/bus/u4b/serial/ulpt.c | 2 +- sys/bus/u4b/serial/umcs.c | 2 +- sys/bus/u4b/serial/umct.c | 2 +- sys/bus/u4b/serial/umodem.c | 2 +- sys/bus/u4b/serial/umoscom.c | 2 +- sys/bus/u4b/serial/uplcom.c | 2 +- sys/bus/u4b/serial/uslcom.c | 2 +- sys/bus/u4b/serial/uvisor.c | 2 +- sys/bus/u4b/serial/uvscom.c | 2 +- sys/bus/u4b/storage/umass.c | 2 +- sys/bus/u4b/storage/urio.c | 2 +- sys/bus/u4b/storage/ustorage_fs.c | 2 +- sys/bus/u4b/usb_compat_linux.c | 2 +- sys/bus/u4b/usb_hub.c | 2 +- sys/bus/u4b/wlan/if_rum.c | 2 +- sys/bus/u4b/wlan/if_run.c | 2 +- sys/bus/u4b/wlan/if_uath.c | 2 +- sys/bus/u4b/wlan/if_upgt.c | 2 +- sys/bus/u4b/wlan/if_ural.c | 2 +- sys/bus/u4b/wlan/if_urtw.c | 2 +- sys/bus/u4b/wlan/if_zyd.c | 2 +- sys/bus/usb/ehci_pci.c | 2 +- sys/bus/usb/ohci_pci.c | 2 +- sys/bus/usb/uhci_pci.c | 2 +- sys/bus/usb/uhub.c | 4 ++-- sys/bus/usb/usb.c | 2 +- sys/bus/usb/usb_port.h | 3 +-- sys/dev/acpica/acpi.c | 2 +- sys/dev/acpica/acpi_acad.c | 2 +- sys/dev/acpica/acpi_asus/acpi_asus.c | 2 +- sys/dev/acpica/acpi_button.c | 2 +- sys/dev/acpica/acpi_cmbat.c | 2 +- sys/dev/acpica/acpi_cpu.c | 2 +- sys/dev/acpica/acpi_cpu_cstate.c | 2 +- sys/dev/acpica/acpi_cpu_pstate.c | 2 +- sys/dev/acpica/acpi_ec.c | 2 +- sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c | 2 +- sys/dev/acpica/acpi_hp/acpi_hp.c | 2 +- sys/dev/acpica/acpi_hpet.c | 2 +- sys/dev/acpica/acpi_isab.c | 2 +- sys/dev/acpica/acpi_lid.c | 2 +- sys/dev/acpica/acpi_panasonic/acpi_panasonic.c | 2 +- sys/dev/acpica/acpi_pci.c | 2 +- sys/dev/acpica/acpi_pci_link.c | 2 +- sys/dev/acpica/acpi_pcib_acpi.c | 2 +- sys/dev/acpica/acpi_pcib_pci.c | 2 +- sys/dev/acpica/acpi_resource.c | 2 +- sys/dev/acpica/acpi_smbat.c | 2 +- sys/dev/acpica/acpi_sony/acpi_sony.c | 2 +- sys/dev/acpica/acpi_thermal.c | 2 +- sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c | 2 +- sys/dev/acpica/acpi_timer.c | 2 +- sys/dev/acpica/acpi_toshiba/acpi_toshiba.c | 4 ++-- sys/dev/acpica/acpi_video/acpi_video.c | 2 +- sys/dev/acpica/acpi_wmi/acpi_wmi.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_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/crypto/aesni/aesni.c | 2 +- sys/dev/crypto/glxsb/glxsb.c | 2 +- sys/dev/crypto/hifn/hifn7751.c | 2 +- sys/dev/crypto/padlock/padlock.c | 2 +- sys/dev/crypto/rdrand/rdrand.c | 2 +- sys/dev/crypto/safe/safe.c | 2 +- sys/dev/crypto/ubsec/ubsec.c | 2 +- sys/dev/disk/advansys/adv_isa.c | 2 +- sys/dev/disk/advansys/adv_pci.c | 2 +- sys/dev/disk/advansys/adw_pci.c | 2 +- sys/dev/disk/ahci/ahci_dragonfly.c | 2 +- sys/dev/disk/aic/aic_pccard.c | 2 +- sys/dev/disk/aic7xxx/ahc_pci.c | 2 +- sys/dev/disk/aic7xxx/ahd_pci.c | 2 +- sys/dev/disk/amd/amd.c | 2 +- sys/dev/disk/buslogic/bt_pci.c | 2 +- sys/dev/disk/fd/fd.c | 4 ++-- sys/dev/disk/fd/fd_pccard.c | 2 +- sys/dev/disk/isp/isp_pci.c | 2 +- sys/dev/disk/mmcsd/mmcsd.c | 2 +- sys/dev/disk/mpt/mpt_pci.c | 2 +- sys/dev/disk/nata/ata-card.c | 2 +- sys/dev/disk/nata/ata-disk.c | 2 +- sys/dev/disk/nata/ata-isa.c | 2 +- sys/dev/disk/nata/ata-pci.c | 4 ++-- sys/dev/disk/nata/ata-raid.c | 2 +- sys/dev/disk/nata/ata-usb.c | 4 ++-- sys/dev/disk/nata/atapi-cam.c | 2 +- sys/dev/disk/nata/atapi-cd.c | 2 +- sys/dev/disk/nata/atapi-fd.c | 3 +-- sys/dev/disk/nata/atapi-tape.c | 3 +-- sys/dev/disk/ncr/ncr.c | 2 +- sys/dev/disk/ncv/ncr53c500_pccard.c | 2 +- sys/dev/disk/nsp/nsp_pccard.c | 2 +- sys/dev/disk/sbp/sbp.c | 2 +- sys/dev/disk/sdhci/sdhci.c | 2 +- sys/dev/disk/sili/sili_dragonfly.c | 2 +- sys/dev/disk/stg/tmc18c30_isa.c | 2 +- sys/dev/disk/stg/tmc18c30_pccard.c | 2 +- sys/dev/disk/sym/sym_hipd.c | 2 +- sys/dev/disk/trm/trm.c | 2 +- sys/dev/disk/vpo/vpo.c | 2 +- sys/dev/drm/i915/i915_drv.c | 2 +- sys/dev/drm/mach64/mach64_drv.c | 2 +- sys/dev/drm/mga/mga_drv.c | 2 +- sys/dev/drm/r128/r128_drv.c | 2 +- sys/dev/drm/radeon/radeon_drv.c | 2 +- sys/dev/drm/savage/savage_drv.c | 2 +- sys/dev/drm/sis/sis_drv.c | 2 +- sys/dev/drm/tdfx/tdfx_drv.c | 2 +- sys/dev/misc/amdsbwd/amdsbwd.c | 2 +- sys/dev/misc/atkbd/atkbd_isa.c | 2 +- sys/dev/misc/atkbdc_layer/atkbdc_isa.c | 2 +- sys/dev/misc/cmx/cmx_pccard.c | 2 +- sys/dev/misc/dcons/dcons_crom.c | 3 +-- sys/dev/misc/ecc/ecc_amd8000.c | 2 +- sys/dev/misc/ecc/ecc_e31200.c | 2 +- sys/dev/misc/ecc/ecc_x3400.c | 2 +- sys/dev/misc/ichwd/ichwd.c | 2 +- sys/dev/misc/joy/joy.c | 2 +- sys/dev/misc/lpbb/lpbb.c | 2 +- sys/dev/misc/lpt/lpt.c | 2 +- sys/dev/misc/musycc/musycc.c | 2 +- sys/dev/misc/nsclpcsio/nsclpcsio_isa.c | 2 +- sys/dev/misc/orm/orm.c | 2 +- sys/dev/misc/pcfclock/pcfclock.c | 2 +- sys/dev/misc/ppc/ppc.c | 2 +- sys/dev/misc/ppi/ppi.c | 2 +- sys/dev/misc/pps/pps.c | 2 +- sys/dev/misc/psm/psm.c | 4 ++-- sys/dev/misc/puc/puc.c | 2 +- sys/dev/misc/spic/spic.c | 2 +- sys/dev/netif/acx/if_acx.c | 2 +- sys/dev/netif/an/if_an_isa.c | 2 +- sys/dev/netif/an/if_an_pccard.c | 2 +- sys/dev/netif/an/if_an_pci.c | 2 +- sys/dev/netif/ar/if_ar_isa.c | 2 +- sys/dev/netif/ar/if_ar_pci.c | 2 +- sys/dev/netif/ath/ath/if_ath_pci.c | 2 +- sys/dev/netif/aue/if_aue.c | 2 +- sys/dev/netif/axe/if_axe.c | 2 +- sys/dev/netif/bce/if_bce.c | 2 +- sys/dev/netif/bfe/if_bfe.c | 2 +- sys/dev/netif/bge/if_bge.c | 2 +- sys/dev/netif/bnx/if_bnx.c | 2 +- sys/dev/netif/bwi/if_bwi.c | 2 +- sys/dev/netif/cs/if_cs_isa.c | 2 +- sys/dev/netif/cs/if_cs_pccard.c | 2 +- sys/dev/netif/cue/if_cue.c | 2 +- sys/dev/netif/dc/if_dc.c | 2 +- sys/dev/netif/de/if_de.c | 2 +- sys/dev/netif/ed/if_ed_isa.c | 2 +- sys/dev/netif/ed/if_ed_pccard.c | 2 +- sys/dev/netif/ed/if_ed_pci.c | 2 +- sys/dev/netif/em/if_em.c | 2 +- sys/dev/netif/emx/if_emx.c | 2 +- sys/dev/netif/ep/if_ep_isa.c | 2 +- sys/dev/netif/ep/if_ep_pccard.c | 2 +- sys/dev/netif/et/if_et.c | 2 +- sys/dev/netif/ex/if_ex_isa.c | 2 +- sys/dev/netif/ex/if_ex_pccard.c | 2 +- sys/dev/netif/fe/if_fe_isa.c | 2 +- sys/dev/netif/fe/if_fe_pccard.c | 2 +- sys/dev/netif/fwe/if_fwe.c | 2 +- sys/dev/netif/fxp/if_fxp.c | 2 +- sys/dev/netif/ic/if_ic.c | 2 +- sys/dev/netif/igb/if_igb.c | 2 +- sys/dev/netif/iwi/if_iwi.c | 2 +- sys/dev/netif/iwl/if_iwl.c | 2 +- sys/dev/netif/iwn/if_iwn.c | 2 +- sys/dev/netif/ixgbe/ixgbe.c | 2 +- sys/dev/netif/kue/if_kue.c | 2 +- sys/dev/netif/lge/if_lge.c | 2 +- sys/dev/netif/lgue/if_lgue.c | 2 +- sys/dev/netif/lnc/if_lnc_isa.c | 2 +- sys/dev/netif/lnc/if_lnc_pci.c | 2 +- sys/dev/netif/mii_layer/acphy.c | 2 +- sys/dev/netif/mii_layer/amphy.c | 2 +- sys/dev/netif/mii_layer/atphy.c | 2 +- sys/dev/netif/mii_layer/brgphy.c | 2 +- sys/dev/netif/mii_layer/ciphy.c | 2 +- sys/dev/netif/mii_layer/dcphy.c | 2 +- sys/dev/netif/mii_layer/e1000phy.c | 2 +- sys/dev/netif/mii_layer/exphy.c | 2 +- sys/dev/netif/mii_layer/inphy.c | 2 +- sys/dev/netif/mii_layer/ip1000phy.c | 2 +- sys/dev/netif/mii_layer/lxtphy.c | 2 +- sys/dev/netif/mii_layer/mii.c | 3 +-- sys/dev/netif/mii_layer/mlphy.c | 2 +- sys/dev/netif/mii_layer/nsgphy.c | 2 +- sys/dev/netif/mii_layer/nsphy.c | 2 +- sys/dev/netif/mii_layer/pnaphy.c | 2 +- sys/dev/netif/mii_layer/pnphy.c | 2 +- sys/dev/netif/mii_layer/qsphy.c | 2 +- sys/dev/netif/mii_layer/rgephy.c | 2 +- sys/dev/netif/mii_layer/rlphy.c | 2 +- sys/dev/netif/mii_layer/ruephy.c | 2 +- sys/dev/netif/mii_layer/tlphy.c | 2 +- sys/dev/netif/mii_layer/truephy.c | 2 +- sys/dev/netif/mii_layer/ukphy.c | 2 +- sys/dev/netif/mii_layer/xmphy.c | 2 +- sys/dev/netif/mn/if_mn.c | 2 +- sys/dev/netif/mxge/if_mxge.c | 2 +- sys/dev/netif/my/if_my.c | 2 +- sys/dev/netif/ndis/if_ndis_pccard.c | 2 +- sys/dev/netif/ndis/if_ndis_pci.c | 2 +- sys/dev/netif/ndis/if_ndis_u4b.c | 2 +- sys/dev/netif/ndis/if_ndis_usb.c | 2 +- sys/dev/netif/nfe/if_nfe.c | 2 +- sys/dev/netif/nge/if_nge.c | 2 +- sys/dev/netif/pcn/if_pcn.c | 2 +- sys/dev/netif/plip/if_plip.c | 2 +- sys/dev/netif/ral/if_ral_pci.c | 2 +- sys/dev/netif/re/if_re.c | 2 +- sys/dev/netif/rl/if_rl.c | 2 +- sys/dev/netif/rtw/if_rtw_pci.c | 2 +- sys/dev/netif/rue/if_rue.c | 2 +- sys/dev/netif/rum/if_rum.c | 2 +- sys/dev/netif/sbni/if_sbni_pci.c | 2 +- sys/dev/netif/sbsh/if_sbsh.c | 2 +- sys/dev/netif/sf/if_sf.c | 2 +- sys/dev/netif/sis/if_sis.c | 2 +- sys/dev/netif/sk/if_sk.c | 4 ++-- sys/dev/netif/sln/if_sln.c | 2 +- sys/dev/netif/sn/if_sn_isa.c | 2 +- sys/dev/netif/sn/if_sn_pccard.c | 2 +- sys/dev/netif/sr/if_sr_pci.c | 2 +- sys/dev/netif/ste/if_ste.c | 2 +- sys/dev/netif/stge/if_stge.c | 2 +- sys/dev/netif/ti/if_ti.c | 2 +- sys/dev/netif/tl/if_tl.c | 2 +- sys/dev/netif/tx/if_tx.c | 2 +- sys/dev/netif/txp/if_txp.c | 2 +- sys/dev/netif/ural/if_ural.c | 2 +- sys/dev/netif/vge/if_vge.c | 2 +- sys/dev/netif/vr/if_vr.c | 2 +- sys/dev/netif/vx/if_vx_pci.c | 2 +- sys/dev/netif/wb/if_wb.c | 2 +- sys/dev/netif/wi/if_wi_pccard.c | 2 +- sys/dev/netif/wi/if_wi_pci.c | 2 +- sys/dev/netif/wpi/if_wpi.c | 2 +- sys/dev/netif/xe/if_xe_pccard.c | 2 +- sys/dev/netif/xl/if_xl.c | 2 +- sys/dev/pccard/cardbus/cardbus.c | 2 +- sys/dev/pccard/pccbb/pccbb_isa.c | 2 +- sys/dev/pccard/pccbb/pccbb_pci.c | 2 +- sys/dev/powermng/alpm/alpm.c | 2 +- sys/dev/powermng/amdpm/amdpm.c | 2 +- sys/dev/powermng/amdsmb/amdsmb.c | 2 +- sys/dev/powermng/coretemp/coretemp.c | 2 +- sys/dev/powermng/ichsmb/ichsmb_pci.c | 2 +- sys/dev/powermng/intpm/intpm.c | 2 +- sys/dev/powermng/it/it.c | 2 +- sys/dev/powermng/lm/lm78_isa.c | 2 +- sys/dev/powermng/viapm/viapm.c | 4 ++-- sys/dev/raid/aac/aac_cam.c | 2 +- sys/dev/raid/aac/aac_disk.c | 2 +- sys/dev/raid/aac/aac_pci.c | 4 ++-- sys/dev/raid/amr/amr_cam.c | 2 +- sys/dev/raid/amr/amr_disk.c | 2 +- sys/dev/raid/amr/amr_pci.c | 2 +- sys/dev/raid/arcmsr/arcmsr.c | 2 +- sys/dev/raid/asr/asr.c | 2 +- sys/dev/raid/ciss/ciss.c | 2 +- sys/dev/raid/dpt/dpt_pci.c | 2 +- sys/dev/raid/hpt27xx/osm_bsd.c | 2 +- sys/dev/raid/hptiop/hptiop.c | 2 +- sys/dev/raid/hptmv/entry.c | 2 +- sys/dev/raid/hptrr/hptrr_osm_bsd.c | 2 +- sys/dev/raid/ida/ida_disk.c | 2 +- sys/dev/raid/ida/ida_pci.c | 2 +- sys/dev/raid/iir/iir_pci.c | 2 +- sys/dev/raid/ips/ips_disk.c | 2 +- sys/dev/raid/ips/ips_pci.c | 2 +- sys/dev/raid/mfi/mfi_cam.c | 2 +- sys/dev/raid/mfi/mfi_disk.c | 2 +- sys/dev/raid/mfi/mfi_pci.c | 2 +- sys/dev/raid/mfi/mfi_syspd.c | 2 +- sys/dev/raid/mlx/mlx_disk.c | 2 +- sys/dev/raid/mlx/mlx_pci.c | 2 +- sys/dev/raid/mly/mly.c | 2 +- sys/dev/raid/mps/mps_pci.c | 2 +- sys/dev/raid/pst/pst-pci.c | 2 +- sys/dev/raid/pst/pst-raid.c | 2 +- sys/dev/raid/twa/tw_osl_freebsd.c | 2 +- sys/dev/raid/twe/twe_freebsd.c | 4 ++-- sys/dev/raid/tws/tws.c | 2 +- sys/dev/serial/digi/digi_isa.c | 2 +- sys/dev/serial/digi/digi_pci.c | 2 +- sys/dev/serial/rp/rp_isa.c | 2 +- sys/dev/serial/rp/rp_pci.c | 2 +- sys/dev/serial/si/si_isa.c | 2 +- sys/dev/serial/si/si_pci.c | 2 +- sys/dev/serial/sio/sio.c | 6 +++--- sys/dev/serial/sio/sio_pccard.c | 2 +- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/atiixp.c | 2 +- sys/dev/sound/pci/au88x0.c | 2 +- sys/dev/sound/pci/aureal.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/csa.c | 2 +- sys/dev/sound/pci/csapcm.c | 2 +- sys/dev/sound/pci/ds1.c | 2 +- sys/dev/sound/pci/emu10k1.c | 4 ++-- 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/fm801.c | 2 +- sys/dev/sound/pci/hda/hdac.c | 2 +- sys/dev/sound/pci/ich.c | 2 +- sys/dev/sound/pci/maestro.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/via8233.c | 2 +- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/usb/uaudio.c | 2 +- sys/dev/sound/usb/uaudio_pcm.c | 2 +- sys/dev/usbmisc/moscom/moscom.c | 2 +- sys/dev/usbmisc/uark/uark.c | 2 +- sys/dev/usbmisc/ubsa/ubsa.c | 2 +- sys/dev/usbmisc/ubt/ubt.c | 3 +-- sys/dev/usbmisc/uchcom/uchcom.c | 2 +- sys/dev/usbmisc/ufm/ufm.c | 2 +- sys/dev/usbmisc/uftdi/uftdi.c | 2 +- sys/dev/usbmisc/ugen/ugen.c | 2 +- sys/dev/usbmisc/ugensa/ugensa.c | 2 +- sys/dev/usbmisc/uhid/uhid.c | 2 +- sys/dev/usbmisc/ukbd/ukbd.c | 2 +- sys/dev/usbmisc/ulpt/ulpt.c | 2 +- sys/dev/usbmisc/umass/umass.c | 3 +-- sys/dev/usbmisc/umct/umct.c | 2 +- sys/dev/usbmisc/umodem/umodem.c | 2 +- sys/dev/usbmisc/ums/ums.c | 2 +- sys/dev/usbmisc/uplcom/uplcom.c | 2 +- sys/dev/usbmisc/urio/urio.c | 2 +- sys/dev/usbmisc/uscanner/uscanner.c | 2 +- sys/dev/usbmisc/uslcom/uslcom.c | 2 +- sys/dev/usbmisc/uticom/uticom.c | 2 +- sys/dev/usbmisc/uvisor/uvisor.c | 2 +- sys/dev/usbmisc/uvscom/uvscom.c | 2 +- sys/dev/video/bktr/bktr_os.c | 2 +- sys/dev/video/cxm/cxm.c | 2 +- sys/dev/video/cxm/cxm_i2c.c | 2 +- sys/dev/video/fb/fb.c | 2 +- sys/dev/virtual/virtio/block/virtio_blk.c | 2 +- sys/dev/virtual/virtio/pci/virtio_pci.c | 2 +- sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c | 2 +- sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c | 2 +- sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 3 +-- sys/opencrypto/cryptosoft.c | 2 +- sys/platform/pc32/apm/apm.c | 2 +- sys/platform/pc32/i386/cs5536.c | 2 +- sys/platform/pc32/i386/geode.c | 2 +- sys/platform/pc32/i386/mp_clock.c | 2 +- sys/platform/pc32/i386/nexus.c | 2 +- sys/platform/pc32/i386/pnpbios.c | 2 +- sys/platform/pc32/isa/npx.c | 2 +- sys/platform/pc32/isa/pmtimer.c | 2 +- sys/platform/pc64/apm/apm.c | 2 +- sys/platform/pc64/isa/pmtimer.c | 2 +- sys/platform/pc64/x86_64/nexus.c | 2 +- usr.sbin/ndiscvt/windrv_stub.c | 2 +- 436 files changed, 458 insertions(+), 467 deletions(-) diff --git a/sys/bus/firewire/firewire.c b/sys/bus/firewire/firewire.c index 3911fffc62..81139fad58 100644 --- a/sys/bus/firewire/firewire.c +++ b/sys/bus/firewire/firewire.c @@ -115,7 +115,7 @@ static device_method_t firewire_methods[] = { DEVMETHOD(bus_add_child, firewire_add_child), DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; char *linkspeed[] = { "S100", "S200", "S400", "S800", diff --git a/sys/bus/firewire/fwohci_pci.c b/sys/bus/firewire/fwohci_pci.c index 1016a1a1d7..4da47c2d8f 100644 --- a/sys/bus/firewire/fwohci_pci.c +++ b/sys/bus/firewire/fwohci_pci.c @@ -475,7 +475,7 @@ static device_method_t fwohci_methods[] = { DEVMETHOD(bus_add_child, fwohci_pci_add_child), DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; static driver_t fwohci_driver = { diff --git a/sys/bus/iicbus/iic.c b/sys/bus/iicbus/iic.c index 90ca545347..c15a5cd9e0 100644 --- a/sys/bus/iicbus/iic.c +++ b/sys/bus/iicbus/iic.c @@ -77,7 +77,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/bus/iicbus/iicbb.c b/sys/bus/iicbus/iicbb.c index 3de7a5ee63..d43e18a5c1 100644 --- a/sys/bus/iicbus/iicbb.c +++ b/sys/bus/iicbus/iicbb.c @@ -94,7 +94,7 @@ static device_method_t iicbb_methods[] = { DEVMETHOD(iicbus_reset, iicbb_reset), DEVMETHOD(iicbus_transfer, iicbus_transfer_gen), - { 0, 0 } + DEVMETHOD_END }; driver_t iicbb_driver = { diff --git a/sys/bus/iicbus/iicbus.c b/sys/bus/iicbus/iicbus.c index 33b16de8ad..a9c1a97aa1 100644 --- a/sys/bus/iicbus/iicbus.c +++ b/sys/bus/iicbus/iicbus.c @@ -69,7 +69,7 @@ static device_method_t iicbus_methods[] = { DEVMETHOD(iicbus_transfer, iicbus_transfer_gen), - { 0, 0 } + DEVMETHOD_END }; driver_t iicbus_driver = { diff --git a/sys/bus/iicbus/iicsmb.c b/sys/bus/iicbus/iicsmb.c index 40793a67d4..8d2d5dc902 100644 --- a/sys/bus/iicbus/iicsmb.c +++ b/sys/bus/iicbus/iicsmb.c @@ -122,7 +122,7 @@ static device_method_t iicsmb_methods[] = { DEVMETHOD(smbus_bwrite, iicsmb_bwrite), DEVMETHOD(smbus_bread, iicsmb_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t iicsmb_driver = { diff --git a/sys/bus/iicbus/pcf/pcf.c b/sys/bus/iicbus/pcf/pcf.c index 51661330c3..888382e92e 100644 --- a/sys/bus/iicbus/pcf/pcf.c +++ b/sys/bus/iicbus/pcf/pcf.c @@ -118,7 +118,7 @@ static device_method_t pcf_methods[] = { DEVMETHOD(iicbus_read, pcf_read), DEVMETHOD(iicbus_reset, pcf_rst_card), - { 0, 0 } + DEVMETHOD_END }; static driver_t pcf_driver = { diff --git a/sys/bus/isa/isa_common.c b/sys/bus/isa/isa_common.c index 83d6926018..f2a349bb1c 100644 --- a/sys/bus/isa/isa_common.c +++ b/sys/bus/isa/isa_common.c @@ -1025,7 +1025,7 @@ static device_method_t isa_methods[] = { DEVMETHOD(isa_set_config_callback, isa_set_config_callback), DEVMETHOD(isa_pnp_probe, isa_pnp_probe), - { 0, 0 } + DEVMETHOD_END }; static driver_t isa_driver = { diff --git a/sys/bus/isa/isahint.c b/sys/bus/isa/isahint.c index 11f6dcd335..7f69f173af 100644 --- a/sys/bus/isa/isahint.c +++ b/sys/bus/isa/isahint.c @@ -134,7 +134,7 @@ static device_method_t isahint_methods[] = { /* Device interface */ DEVMETHOD(device_identify, isahint_identify), - { 0, 0 } + DEVMETHOD_END }; static driver_t isahint_driver = { diff --git a/sys/bus/isa/pnp.c b/sys/bus/isa/pnp.c index e7a18443da..b8b3cce562 100644 --- a/sys/bus/isa/pnp.c +++ b/sys/bus/isa/pnp.c @@ -803,7 +803,7 @@ static device_method_t pnp_methods[] = { /* Device interface */ DEVMETHOD(device_identify, pnp_identify), - { 0, 0 } + DEVMETHOD_END }; static driver_t pnp_driver = { diff --git a/sys/bus/isa/pnpeat.c b/sys/bus/isa/pnpeat.c index 80e01f906f..1f63bc4725 100644 --- a/sys/bus/isa/pnpeat.c +++ b/sys/bus/isa/pnpeat.c @@ -86,7 +86,7 @@ static device_method_t sysresource_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 sysresource_driver = { diff --git a/sys/bus/isa/syscons_isa.c b/sys/bus/isa/syscons_isa.c index 167b9dff73..216d948f08 100644 --- a/sys/bus/isa/syscons_isa.c +++ b/sys/bus/isa/syscons_isa.c @@ -69,7 +69,7 @@ static int scattach(device_t dev); static device_method_t sc_methods[] = { DEVMETHOD(device_probe, scprobe), DEVMETHOD(device_attach, scattach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sc_driver = { diff --git a/sys/bus/isa/vga_isa.c b/sys/bus/isa/vga_isa.c index cf07860574..f72e2a4192 100644 --- a/sys/bus/isa/vga_isa.c +++ b/sys/bus/isa/vga_isa.c @@ -72,7 +72,7 @@ static device_method_t isavga_methods[] = { DEVMETHOD(device_resume, isavga_resume), DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; static driver_t isavga_driver = { diff --git a/sys/bus/mmc/mmc.c b/sys/bus/mmc/mmc.c index b90903f5dd..3365a633d5 100644 --- a/sys/bus/mmc/mmc.c +++ b/sys/bus/mmc/mmc.c @@ -1512,7 +1512,7 @@ static device_method_t mmc_methods[] = { DEVMETHOD(mmcbus_acquire_bus, mmc_acquire_bus), DEVMETHOD(mmcbus_release_bus, mmc_release_bus), - {0, 0}, + DEVMETHOD_END }; static driver_t mmc_driver = { diff --git a/sys/bus/pccard/pccard.c b/sys/bus/pccard/pccard.c index 26c986d7b5..c4d4e5b51a 100644 --- a/sys/bus/pccard/pccard.c +++ b/sys/bus/pccard/pccard.c @@ -1350,7 +1350,7 @@ static device_method_t pccard_methods[] = { DEVMETHOD(card_do_product_lookup, pccard_do_product_lookup), DEVMETHOD(card_cis_scan, pccard_scan_cis), - { 0, 0 } + DEVMETHOD_END }; static driver_t pccard_driver = { diff --git a/sys/bus/pci/fixup_pci.c b/sys/bus/pci/fixup_pci.c index 53c40bf33f..dc83ff2daa 100644 --- a/sys/bus/pci/fixup_pci.c +++ b/sys/bus/pci/fixup_pci.c @@ -57,7 +57,7 @@ static device_method_t fixup_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, fixup_pci_probe), DEVMETHOD(device_attach, bus_generic_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t fixup_pci_driver = { diff --git a/sys/bus/pci/hostb_pci.c b/sys/bus/pci/hostb_pci.c index e9e75417a2..522ba2ab70 100644 --- a/sys/bus/pci/hostb_pci.c +++ b/sys/bus/pci/hostb_pci.c @@ -237,7 +237,7 @@ static device_method_t pci_hostb_methods[] = { DEVMETHOD(pci_assign_interrupt, pci_hostb_assign_interrupt), DEVMETHOD(pci_find_extcap, pci_hostb_find_extcap), - { 0, 0 } + DEVMETHOD_END }; static driver_t pci_hostb_driver = { diff --git a/sys/bus/pci/i386/legacy.c b/sys/bus/pci/i386/legacy.c index 2f71a53edd..c866d110aa 100644 --- a/sys/bus/pci/i386/legacy.c +++ b/sys/bus/pci/i386/legacy.c @@ -81,7 +81,7 @@ static device_method_t legacy_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t legacy_driver = { @@ -272,7 +272,7 @@ static device_method_t cpu_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t cpu_driver = { diff --git a/sys/bus/pci/i386/mptable_pci.c b/sys/bus/pci/i386/mptable_pci.c index cb69391369..df11d4ddbf 100644 --- a/sys/bus/pci/i386/mptable_pci.c +++ b/sys/bus/pci/i386/mptable_pci.c @@ -180,7 +180,7 @@ static device_method_t mptable_hostb_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, mptable_hostb_map_msi), - { 0, 0 } + DEVMETHOD_END }; static devclass_t hostb_devclass; @@ -242,7 +242,7 @@ static device_method_t mptable_pcib_pci_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/bus/pci/i386/pci_bus.c b/sys/bus/pci/i386/pci_bus.c index 45714ea71a..f4b183c983 100644 --- a/sys/bus/pci/i386/pci_bus.c +++ b/sys/bus/pci/i386/pci_bus.c @@ -573,7 +573,7 @@ static device_method_t legacy_pcib_methods[] = { DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, legacy_pcib_map_msi), - { 0, 0 } + DEVMETHOD_END }; static devclass_t hostb_devclass; @@ -621,7 +621,7 @@ static device_method_t pcibus_pnp_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pcibus_pnp_devclass; @@ -667,7 +667,7 @@ static device_method_t pcibios_pcib_pci_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/bus/pci/i386/pci_pir.c b/sys/bus/pci/i386/pci_pir.c index 225ce99f45..02b580698f 100644 --- a/sys/bus/pci/i386/pci_pir.c +++ b/sys/bus/pci/i386/pci_pir.c @@ -736,7 +736,7 @@ static device_method_t pir_methods[] = { DEVMETHOD(device_attach, pir_attach), DEVMETHOD(device_resume, pir_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t pir_driver = { diff --git a/sys/bus/pci/ignore_pci.c b/sys/bus/pci/ignore_pci.c index a733b26d87..72297e9790 100644 --- a/sys/bus/pci/ignore_pci.c +++ b/sys/bus/pci/ignore_pci.c @@ -45,7 +45,7 @@ static device_method_t ignore_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ignore_pci_probe), DEVMETHOD(device_attach, bus_generic_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ignore_pci_driver = { diff --git a/sys/bus/pci/isa_pci.c b/sys/bus/pci/isa_pci.c index 2ad55d19eb..5400a0c658 100644 --- a/sys/bus/pci/isa_pci.c +++ b/sys/bus/pci/isa_pci.c @@ -72,7 +72,7 @@ static device_method_t isab_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t isab_driver = { diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index d3cd7aa4ee..dd9c7e7c2b 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -179,7 +179,7 @@ static device_method_t pci_methods[] = { DEVMETHOD(pci_msi_count, pci_msi_count_method), DEVMETHOD(pci_msix_count, pci_msix_count_method), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_0(pci, pci_driver, pci_methods, 0); diff --git a/sys/bus/pci/pci_compat.c b/sys/bus/pci/pci_compat.c index a4712927cc..87011d968d 100644 --- a/sys/bus/pci/pci_compat.c +++ b/sys/bus/pci/pci_compat.c @@ -233,7 +233,7 @@ static device_method_t pci_compat_methods[] = { DEVMETHOD(device_probe, pci_compat_probe), DEVMETHOD(device_attach, pci_compat_attach), - { 0, 0 } + DEVMETHOD_END }; /* diff --git a/sys/bus/pci/pci_pci.c b/sys/bus/pci/pci_pci.c index c6d6a48c8c..91f1d7355a 100644 --- a/sys/bus/pci/pci_pci.c +++ b/sys/bus/pci/pci_pci.c @@ -82,7 +82,7 @@ static device_method_t pcib_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/bus/pci/vga_pci.c b/sys/bus/pci/vga_pci.c index 33a7cec0bc..94f6c576e3 100644 --- a/sys/bus/pci/vga_pci.c +++ b/sys/bus/pci/vga_pci.c @@ -240,7 +240,7 @@ static device_method_t vga_pci_methods[] = { DEVMETHOD(pci_assign_interrupt, vga_pci_assign_interrupt), DEVMETHOD(pci_find_extcap, vga_pci_find_extcap), - { 0, 0 } + DEVMETHOD_END }; static driver_t vga_pci_driver = { diff --git a/sys/bus/pci/x86_64/legacy.c b/sys/bus/pci/x86_64/legacy.c index 2f71a53edd..c866d110aa 100644 --- a/sys/bus/pci/x86_64/legacy.c +++ b/sys/bus/pci/x86_64/legacy.c @@ -81,7 +81,7 @@ static device_method_t legacy_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t legacy_driver = { @@ -272,7 +272,7 @@ static device_method_t cpu_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t cpu_driver = { diff --git a/sys/bus/pci/x86_64/mptable_pci.c b/sys/bus/pci/x86_64/mptable_pci.c index cb69391369..df11d4ddbf 100644 --- a/sys/bus/pci/x86_64/mptable_pci.c +++ b/sys/bus/pci/x86_64/mptable_pci.c @@ -180,7 +180,7 @@ static device_method_t mptable_hostb_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, mptable_hostb_map_msi), - { 0, 0 } + DEVMETHOD_END }; static devclass_t hostb_devclass; @@ -242,7 +242,7 @@ static device_method_t mptable_pcib_pci_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/bus/pci/x86_64/pci_bus.c b/sys/bus/pci/x86_64/pci_bus.c index 0170de4deb..70d84ac992 100644 --- a/sys/bus/pci/x86_64/pci_bus.c +++ b/sys/bus/pci/x86_64/pci_bus.c @@ -574,7 +574,7 @@ static device_method_t legacy_pcib_methods[] = { DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, legacy_pcib_map_msi), - { 0, 0 } + DEVMETHOD_END }; static devclass_t hostb_devclass; @@ -622,7 +622,7 @@ static device_method_t pcibus_pnp_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pcibus_pnp_devclass; @@ -670,7 +670,7 @@ static device_method_t pcibios_pcib_pci_methods[] = { DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, pcib_map_msi), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/bus/pci/x86_64/pci_pir.c b/sys/bus/pci/x86_64/pci_pir.c index 225ce99f45..02b580698f 100644 --- a/sys/bus/pci/x86_64/pci_pir.c +++ b/sys/bus/pci/x86_64/pci_pir.c @@ -736,7 +736,7 @@ static device_method_t pir_methods[] = { DEVMETHOD(device_attach, pir_attach), DEVMETHOD(device_resume, pir_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t pir_driver = { diff --git a/sys/bus/ppbus/ppbconf.c b/sys/bus/ppbus/ppbconf.c index b6b89913c2..914425759b 100644 --- a/sys/bus/ppbus/ppbconf.c +++ b/sys/bus/ppbus/ppbconf.c @@ -556,7 +556,7 @@ static device_method_t ppbus_methods[] = { DEVMETHOD(bus_teardown_intr, ppbus_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), - { 0, 0 } + DEVMETHOD_END }; static driver_t ppbus_driver = { diff --git a/sys/bus/smbus/smb.c b/sys/bus/smbus/smb.c index 7941c5813e..f711ab914f 100644 --- a/sys/bus/smbus/smb.c +++ b/sys/bus/smbus/smb.c @@ -74,7 +74,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/bus/smbus/smbus.c b/sys/bus/smbus/smbus.c index 1e2d6fab6c..828a8b98f1 100644 --- a/sys/bus/smbus/smbus.c +++ b/sys/bus/smbus/smbus.c @@ -24,9 +24,8 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/smbus/smbus.c,v 1.18.10.4 2006/09/26 18:44:56 jhb Exp $ - * $DragonFly: src/sys/bus/smbus/smbus.c,v 1.4 2006/12/22 23:12:17 swildner Exp $ - * */ + #include #include #include @@ -57,7 +56,7 @@ static device_method_t smbus_methods[] = { DEVMETHOD(bus_add_child, bus_generic_add_child), DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; driver_t smbus_driver = { diff --git a/sys/bus/u4b/audio/uaudio.c b/sys/bus/u4b/audio/uaudio.c index 16f9bbf56e..aaf8daf187 100644 --- a/sys/bus/u4b/audio/uaudio.c +++ b/sys/bus/u4b/audio/uaudio.c @@ -522,7 +522,7 @@ static device_method_t uaudio_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t uaudio_driver = { diff --git a/sys/bus/u4b/audio/uaudio_pcm.c b/sys/bus/u4b/audio/uaudio_pcm.c index 068efb610a..97a18cc34c 100644 --- a/sys/bus/u4b/audio/uaudio_pcm.c +++ b/sys/bus/u4b/audio/uaudio_pcm.c @@ -231,7 +231,7 @@ static device_method_t ua_pcm_methods[] = { DEVMETHOD(device_attach, ua_attach), DEVMETHOD(device_detach, ua_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ua_pcm_driver = { diff --git a/sys/bus/u4b/controller/ehci_pci.c b/sys/bus/u4b/controller/ehci_pci.c index a732cb426b..2fe86887ec 100644 --- a/sys/bus/u4b/controller/ehci_pci.c +++ b/sys/bus/u4b/controller/ehci_pci.c @@ -534,7 +534,7 @@ static device_method_t ehci_pci_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(usb_take_controller, ehci_pci_take_controller), - { 0, 0 } + DEVMETHOD_END }; static driver_t ehci_driver = { diff --git a/sys/bus/u4b/controller/ohci_pci.c b/sys/bus/u4b/controller/ohci_pci.c index bdbabaedc9..8ad83cd4ec 100644 --- a/sys/bus/u4b/controller/ohci_pci.c +++ b/sys/bus/u4b/controller/ohci_pci.c @@ -363,7 +363,7 @@ static device_method_t ohci_pci_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(usb_take_controller, ohci_pci_take_controller), - { 0, 0 } + DEVMETHOD_END }; static driver_t ohci_driver = { diff --git a/sys/bus/u4b/controller/uhci_pci.c b/sys/bus/u4b/controller/uhci_pci.c index 4ca4fc8f3f..0216a41105 100644 --- a/sys/bus/u4b/controller/uhci_pci.c +++ b/sys/bus/u4b/controller/uhci_pci.c @@ -426,7 +426,7 @@ static device_method_t uhci_pci_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(usb_take_controller, uhci_pci_take_controller), - { 0, 0 } + DEVMETHOD_END }; static driver_t uhci_driver = { diff --git a/sys/bus/u4b/controller/usb_controller.c b/sys/bus/u4b/controller/usb_controller.c index 8b0e92e3dc..183eff3c04 100644 --- a/sys/bus/u4b/controller/usb_controller.c +++ b/sys/bus/u4b/controller/usb_controller.c @@ -101,7 +101,7 @@ static device_method_t usb_methods[] = { DEVMETHOD(device_suspend, usb_suspend), DEVMETHOD(device_resume, usb_resume), DEVMETHOD(device_shutdown, usb_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t usb_driver = { diff --git a/sys/bus/u4b/controller/xhci_pci.c b/sys/bus/u4b/controller/xhci_pci.c index e936567e23..408afbdb05 100644 --- a/sys/bus/u4b/controller/xhci_pci.c +++ b/sys/bus/u4b/controller/xhci_pci.c @@ -70,7 +70,7 @@ static device_method_t xhci_device_methods[] = { DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(usb_take_controller, xhci_pci_take_controller), - { 0, 0 } + DEVMETHOD_END }; static driver_t xhci_driver = { diff --git a/sys/bus/u4b/input/atp.c b/sys/bus/u4b/input/atp.c index 6cfba78161..0a32026fd0 100644 --- a/sys/bus/u4b/input/atp.c +++ b/sys/bus/u4b/input/atp.c @@ -2209,7 +2209,7 @@ static device_method_t atp_methods[] = { DEVMETHOD(device_probe, atp_probe), DEVMETHOD(device_attach, atp_attach), DEVMETHOD(device_detach, atp_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t atp_driver = { diff --git a/sys/bus/u4b/input/uep.c b/sys/bus/u4b/input/uep.c index f4757478cd..6df76ae269 100644 --- a/sys/bus/u4b/input/uep.c +++ b/sys/bus/u4b/input/uep.c @@ -429,7 +429,7 @@ static device_method_t uep_methods[] = { DEVMETHOD(device_probe, uep_probe), DEVMETHOD(device_attach, uep_attach), DEVMETHOD(device_detach, uep_detach), - { 0, 0 }, + DEVMETHOD_END }; static driver_t uep_driver = { diff --git a/sys/bus/u4b/input/uhid.c b/sys/bus/u4b/input/uhid.c index 71f28a8958..1c8cfd35d8 100644 --- a/sys/bus/u4b/input/uhid.c +++ b/sys/bus/u4b/input/uhid.c @@ -791,7 +791,7 @@ static device_method_t uhid_methods[] = { DEVMETHOD(device_probe, uhid_probe), DEVMETHOD(device_attach, uhid_attach), DEVMETHOD(device_detach, uhid_detach), - {0, 0} + DEVMETHOD_END }; static driver_t uhid_driver = { diff --git a/sys/bus/u4b/input/ukbd.c b/sys/bus/u4b/input/ukbd.c index 92070a935d..4f4aa54b36 100644 --- a/sys/bus/u4b/input/ukbd.c +++ b/sys/bus/u4b/input/ukbd.c @@ -2135,7 +2135,7 @@ static device_method_t ukbd_methods[] = { DEVMETHOD(device_attach, ukbd_attach), DEVMETHOD(device_detach, ukbd_detach), DEVMETHOD(device_resume, ukbd_resume), - {0, 0} + DEVMETHOD_END }; static driver_t ukbd_driver = { diff --git a/sys/bus/u4b/input/ums.c b/sys/bus/u4b/input/ums.c index a1db6c81eb..04b489580c 100644 --- a/sys/bus/u4b/input/ums.c +++ b/sys/bus/u4b/input/ums.c @@ -1051,7 +1051,7 @@ static device_method_t ums_methods[] = { DEVMETHOD(device_probe, ums_probe), DEVMETHOD(device_attach, ums_attach), DEVMETHOD(device_detach, ums_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ums_driver = { diff --git a/sys/bus/u4b/misc/udbp.c b/sys/bus/u4b/misc/udbp.c index c55edf205e..ccc55492fb 100644 --- a/sys/bus/u4b/misc/udbp.c +++ b/sys/bus/u4b/misc/udbp.c @@ -248,7 +248,7 @@ static device_method_t udbp_methods[] = { DEVMETHOD(device_probe, udbp_probe), DEVMETHOD(device_attach, udbp_attach), DEVMETHOD(device_detach, udbp_detach), - {0, 0} + DEVMETHOD_END }; static driver_t udbp_driver = { diff --git a/sys/bus/u4b/misc/ufm.c b/sys/bus/u4b/misc/ufm.c index 11bea65ae5..500c343046 100644 --- a/sys/bus/u4b/misc/ufm.c +++ b/sys/bus/u4b/misc/ufm.c @@ -105,7 +105,7 @@ static device_method_t ufm_methods[] = { DEVMETHOD(device_probe, ufm_probe), DEVMETHOD(device_attach, ufm_attach), DEVMETHOD(device_detach, ufm_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ufm_driver = { diff --git a/sys/bus/u4b/net/if_axe.c b/sys/bus/u4b/net/if_axe.c index 47d2b17161..5f8fae5cab 100644 --- a/sys/bus/u4b/net/if_axe.c +++ b/sys/bus/u4b/net/if_axe.c @@ -258,7 +258,7 @@ static device_method_t axe_methods[] = { DEVMETHOD(miibus_writereg, axe_miibus_writereg), DEVMETHOD(miibus_statchg, axe_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t axe_driver = { diff --git a/sys/bus/u4b/net/if_cdce.c b/sys/bus/u4b/net/if_cdce.c index eabf9c68d6..c0fa2cb1ee 100644 --- a/sys/bus/u4b/net/if_cdce.c +++ b/sys/bus/u4b/net/if_cdce.c @@ -237,7 +237,7 @@ static device_method_t cdce_methods[] = { DEVMETHOD(device_suspend, cdce_suspend), DEVMETHOD(device_resume, cdce_resume), - {0, 0} + DEVMETHOD_END }; static driver_t cdce_driver = { diff --git a/sys/bus/u4b/net/if_cue.c b/sys/bus/u4b/net/if_cue.c index 7466ba9342..b72444eb70 100644 --- a/sys/bus/u4b/net/if_cue.c +++ b/sys/bus/u4b/net/if_cue.c @@ -157,7 +157,7 @@ static device_method_t cue_methods[] = { DEVMETHOD(device_attach, cue_attach), DEVMETHOD(device_detach, cue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t cue_driver = { diff --git a/sys/bus/u4b/net/if_ipheth.c b/sys/bus/u4b/net/if_ipheth.c index ad4b6f1226..39049eba4b 100644 --- a/sys/bus/u4b/net/if_ipheth.c +++ b/sys/bus/u4b/net/if_ipheth.c @@ -116,7 +116,7 @@ static device_method_t ipheth_methods[] = { DEVMETHOD(device_attach, ipheth_attach), DEVMETHOD(device_detach, ipheth_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ipheth_driver = { diff --git a/sys/bus/u4b/net/if_kue.c b/sys/bus/u4b/net/if_kue.c index 2d3fc422a9..b7f37478fe 100644 --- a/sys/bus/u4b/net/if_kue.c +++ b/sys/bus/u4b/net/if_kue.c @@ -199,7 +199,7 @@ static device_method_t kue_methods[] = { DEVMETHOD(device_attach, kue_attach), DEVMETHOD(device_detach, kue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t kue_driver = { diff --git a/sys/bus/u4b/net/if_udav.c b/sys/bus/u4b/net/if_udav.c index 7acb9dc533..09ce813b22 100644 --- a/sys/bus/u4b/net/if_udav.c +++ b/sys/bus/u4b/net/if_udav.c @@ -147,7 +147,7 @@ static device_method_t udav_methods[] = { DEVMETHOD(miibus_writereg, udav_miibus_writereg), DEVMETHOD(miibus_statchg, udav_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t udav_driver = { diff --git a/sys/bus/u4b/net/if_usie.c b/sys/bus/u4b/net/if_usie.c index f9201280ee..ffbe0c3ed7 100644 --- a/sys/bus/u4b/net/if_usie.c +++ b/sys/bus/u4b/net/if_usie.c @@ -189,7 +189,7 @@ static device_method_t usie_methods[] = { DEVMETHOD(device_probe, usie_probe), DEVMETHOD(device_attach, usie_attach), DEVMETHOD(device_detach, usie_detach), - {0, 0} + DEVMETHOD_END }; static driver_t usie_driver = { diff --git a/sys/bus/u4b/net/uhso.c b/sys/bus/u4b/net/uhso.c index 2c778409e3..92860859af 100644 --- a/sys/bus/u4b/net/uhso.c +++ b/sys/bus/u4b/net/uhso.c @@ -478,7 +478,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/bus/u4b/serial/u3g.c b/sys/bus/u4b/serial/u3g.c index 24c4a3e494..f36084b45f 100644 --- a/sys/bus/u4b/serial/u3g.c +++ b/sys/bus/u4b/serial/u3g.c @@ -163,7 +163,7 @@ static device_method_t u3g_methods[] = { DEVMETHOD(device_probe, u3g_probe), DEVMETHOD(device_attach, u3g_attach), DEVMETHOD(device_detach, u3g_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t u3g_devclass; diff --git a/sys/bus/u4b/serial/uark.c b/sys/bus/u4b/serial/uark.c index 575d966d2c..86b397e40f 100644 --- a/sys/bus/u4b/serial/uark.c +++ b/sys/bus/u4b/serial/uark.c @@ -151,7 +151,7 @@ static device_method_t uark_methods[] = { DEVMETHOD(device_probe, uark_probe), DEVMETHOD(device_attach, uark_attach), DEVMETHOD(device_detach, uark_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uark_devclass; diff --git a/sys/bus/u4b/serial/ubsa.c b/sys/bus/u4b/serial/ubsa.c index 3733f61093..5839ae797b 100644 --- a/sys/bus/u4b/serial/ubsa.c +++ b/sys/bus/u4b/serial/ubsa.c @@ -257,7 +257,7 @@ static device_method_t ubsa_methods[] = { DEVMETHOD(device_probe, ubsa_probe), DEVMETHOD(device_attach, ubsa_attach), DEVMETHOD(device_detach, ubsa_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t ubsa_devclass; diff --git a/sys/bus/u4b/serial/ubser.c b/sys/bus/u4b/serial/ubser.c index 1a3e74dd62..14f131cfb0 100644 --- a/sys/bus/u4b/serial/ubser.c +++ b/sys/bus/u4b/serial/ubser.c @@ -193,7 +193,7 @@ static device_method_t ubser_methods[] = { DEVMETHOD(device_probe, ubser_probe), DEVMETHOD(device_attach, ubser_attach), DEVMETHOD(device_detach, ubser_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t ubser_devclass; diff --git a/sys/bus/u4b/serial/uchcom.c b/sys/bus/u4b/serial/uchcom.c index 21649599dc..00d000ed95 100644 --- a/sys/bus/u4b/serial/uchcom.c +++ b/sys/bus/u4b/serial/uchcom.c @@ -836,7 +836,7 @@ static device_method_t uchcom_methods[] = { DEVMETHOD(device_attach, uchcom_attach), DEVMETHOD(device_detach, uchcom_detach), - {0, 0} + DEVMETHOD_END }; static driver_t uchcom_driver = { diff --git a/sys/bus/u4b/serial/ucycom.c b/sys/bus/u4b/serial/ucycom.c index 8ea493ee59..973484e3f5 100644 --- a/sys/bus/u4b/serial/ucycom.c +++ b/sys/bus/u4b/serial/ucycom.c @@ -155,7 +155,7 @@ static device_method_t ucycom_methods[] = { DEVMETHOD(device_probe, ucycom_probe), DEVMETHOD(device_attach, ucycom_attach), DEVMETHOD(device_detach, ucycom_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t ucycom_devclass; diff --git a/sys/bus/u4b/serial/ufoma.c b/sys/bus/u4b/serial/ufoma.c index 2d67cab6fe..5398d9893b 100644 --- a/sys/bus/u4b/serial/ufoma.c +++ b/sys/bus/u4b/serial/ufoma.c @@ -308,7 +308,7 @@ static device_method_t ufoma_methods[] = { DEVMETHOD(device_probe, ufoma_probe), DEVMETHOD(device_attach, ufoma_attach), DEVMETHOD(device_detach, ufoma_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t ufoma_devclass; diff --git a/sys/bus/u4b/serial/uftdi.c b/sys/bus/u4b/serial/uftdi.c index a73a978dd0..07e1e03d44 100644 --- a/sys/bus/u4b/serial/uftdi.c +++ b/sys/bus/u4b/serial/uftdi.c @@ -184,7 +184,7 @@ static device_method_t uftdi_methods[] = { DEVMETHOD(device_attach, uftdi_attach), DEVMETHOD(device_detach, uftdi_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uftdi_devclass; diff --git a/sys/bus/u4b/serial/ugensa.c b/sys/bus/u4b/serial/ugensa.c index 96bbf8cab7..dd6f9434ca 100644 --- a/sys/bus/u4b/serial/ugensa.c +++ b/sys/bus/u4b/serial/ugensa.c @@ -135,7 +135,7 @@ static device_method_t ugensa_methods[] = { DEVMETHOD(device_probe, ugensa_probe), DEVMETHOD(device_attach, ugensa_attach), DEVMETHOD(device_detach, ugensa_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t ugensa_devclass; diff --git a/sys/bus/u4b/serial/uipaq.c b/sys/bus/u4b/serial/uipaq.c index 2569d13d41..6144983256 100644 --- a/sys/bus/u4b/serial/uipaq.c +++ b/sys/bus/u4b/serial/uipaq.c @@ -1064,7 +1064,7 @@ static device_method_t uipaq_methods[] = { DEVMETHOD(device_probe, uipaq_probe), DEVMETHOD(device_attach, uipaq_attach), DEVMETHOD(device_detach, uipaq_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uipaq_devclass; diff --git a/sys/bus/u4b/serial/ulpt.c b/sys/bus/u4b/serial/ulpt.c index 092b548750..4e3535adbc 100644 --- a/sys/bus/u4b/serial/ulpt.c +++ b/sys/bus/u4b/serial/ulpt.c @@ -740,7 +740,7 @@ static device_method_t ulpt_methods[] = { DEVMETHOD(device_probe, ulpt_probe), DEVMETHOD(device_attach, ulpt_attach), DEVMETHOD(device_detach, ulpt_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ulpt_driver = { diff --git a/sys/bus/u4b/serial/umcs.c b/sys/bus/u4b/serial/umcs.c index c50006e0e5..70d2a99860 100644 --- a/sys/bus/u4b/serial/umcs.c +++ b/sys/bus/u4b/serial/umcs.c @@ -257,7 +257,7 @@ static device_method_t umcs7840_methods[] = { DEVMETHOD(device_probe, umcs7840_probe), DEVMETHOD(device_attach, umcs7840_attach), DEVMETHOD(device_detach, umcs7840_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t umcs7840_devclass; diff --git a/sys/bus/u4b/serial/umct.c b/sys/bus/u4b/serial/umct.c index a98c864c31..5b316459cd 100644 --- a/sys/bus/u4b/serial/umct.c +++ b/sys/bus/u4b/serial/umct.c @@ -198,7 +198,7 @@ static device_method_t umct_methods[] = { DEVMETHOD(device_probe, umct_probe), DEVMETHOD(device_attach, umct_attach), DEVMETHOD(device_detach, umct_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t umct_devclass; diff --git a/sys/bus/u4b/serial/umodem.c b/sys/bus/u4b/serial/umodem.c index f37702bdb7..2587164a54 100644 --- a/sys/bus/u4b/serial/umodem.c +++ b/sys/bus/u4b/serial/umodem.c @@ -250,7 +250,7 @@ static device_method_t umodem_methods[] = { DEVMETHOD(device_probe, umodem_probe), DEVMETHOD(device_attach, umodem_attach), DEVMETHOD(device_detach, umodem_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t umodem_devclass; diff --git a/sys/bus/u4b/serial/umoscom.c b/sys/bus/u4b/serial/umoscom.c index e02344416b..8e07ecb9e1 100644 --- a/sys/bus/u4b/serial/umoscom.c +++ b/sys/bus/u4b/serial/umoscom.c @@ -261,7 +261,7 @@ static device_method_t umoscom_methods[] = { DEVMETHOD(device_probe, umoscom_probe), DEVMETHOD(device_attach, umoscom_attach), DEVMETHOD(device_detach, umoscom_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t umoscom_devclass; diff --git a/sys/bus/u4b/serial/uplcom.c b/sys/bus/u4b/serial/uplcom.c index e2052c93d6..efde7f80b3 100644 --- a/sys/bus/u4b/serial/uplcom.c +++ b/sys/bus/u4b/serial/uplcom.c @@ -308,7 +308,7 @@ static device_method_t uplcom_methods[] = { DEVMETHOD(device_probe, uplcom_probe), DEVMETHOD(device_attach, uplcom_attach), DEVMETHOD(device_detach, uplcom_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uplcom_devclass; diff --git a/sys/bus/u4b/serial/uslcom.c b/sys/bus/u4b/serial/uslcom.c index c920eb8f97..aa266665b3 100644 --- a/sys/bus/u4b/serial/uslcom.c +++ b/sys/bus/u4b/serial/uslcom.c @@ -295,7 +295,7 @@ static device_method_t uslcom_methods[] = { DEVMETHOD(device_probe, uslcom_probe), DEVMETHOD(device_attach, uslcom_attach), DEVMETHOD(device_detach, uslcom_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uslcom_devclass; diff --git a/sys/bus/u4b/serial/uvisor.c b/sys/bus/u4b/serial/uvisor.c index 9299692020..4074c6313c 100644 --- a/sys/bus/u4b/serial/uvisor.c +++ b/sys/bus/u4b/serial/uvisor.c @@ -234,7 +234,7 @@ static device_method_t uvisor_methods[] = { DEVMETHOD(device_probe, uvisor_probe), DEVMETHOD(device_attach, uvisor_attach), DEVMETHOD(device_detach, uvisor_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uvisor_devclass; diff --git a/sys/bus/u4b/serial/uvscom.c b/sys/bus/u4b/serial/uvscom.c index 4084529ca3..62f201c428 100644 --- a/sys/bus/u4b/serial/uvscom.c +++ b/sys/bus/u4b/serial/uvscom.c @@ -244,7 +244,7 @@ static device_method_t uvscom_methods[] = { DEVMETHOD(device_probe, uvscom_probe), DEVMETHOD(device_attach, uvscom_attach), DEVMETHOD(device_detach, uvscom_detach), - {0, 0} + DEVMETHOD_END }; static devclass_t uvscom_devclass; diff --git a/sys/bus/u4b/storage/umass.c b/sys/bus/u4b/storage/umass.c index deb09c4e22..34a63ae783 100644 --- a/sys/bus/u4b/storage/umass.c +++ b/sys/bus/u4b/storage/umass.c @@ -700,7 +700,7 @@ static device_method_t umass_methods[] = { DEVMETHOD(device_probe, umass_probe), DEVMETHOD(device_attach, umass_attach), DEVMETHOD(device_detach, umass_detach), - {0, 0} + DEVMETHOD_END }; static driver_t umass_driver = { diff --git a/sys/bus/u4b/storage/urio.c b/sys/bus/u4b/storage/urio.c index e79ae8720a..435a69d2bb 100644 --- a/sys/bus/u4b/storage/urio.c +++ b/sys/bus/u4b/storage/urio.c @@ -185,7 +185,7 @@ static device_method_t urio_methods[] = { DEVMETHOD(device_probe, urio_probe), DEVMETHOD(device_attach, urio_attach), DEVMETHOD(device_detach, urio_detach), - {0, 0} + DEVMETHOD_END }; static driver_t urio_driver = { diff --git a/sys/bus/u4b/storage/ustorage_fs.c b/sys/bus/u4b/storage/ustorage_fs.c index 63face4924..f55a8d07f0 100644 --- a/sys/bus/u4b/storage/ustorage_fs.c +++ b/sys/bus/u4b/storage/ustorage_fs.c @@ -251,7 +251,7 @@ static device_method_t ustorage_fs_methods[] = { DEVMETHOD(device_suspend, ustorage_fs_suspend), DEVMETHOD(device_resume, ustorage_fs_resume), - {0, 0} + DEVMETHOD_END }; static driver_t ustorage_fs_driver = { diff --git a/sys/bus/u4b/usb_compat_linux.c b/sys/bus/u4b/usb_compat_linux.c index 2bdf4dcbc9..376f9c9bde 100644 --- a/sys/bus/u4b/usb_compat_linux.c +++ b/sys/bus/u4b/usb_compat_linux.c @@ -107,7 +107,7 @@ static device_method_t usb_linux_methods[] = { DEVMETHOD(device_suspend, usb_linux_suspend), DEVMETHOD(device_resume, usb_linux_resume), - {0, 0} + DEVMETHOD_END }; static driver_t usb_linux_driver = { diff --git a/sys/bus/u4b/usb_hub.c b/sys/bus/u4b/usb_hub.c index 872fe126da..014f2a1003 100644 --- a/sys/bus/u4b/usb_hub.c +++ b/sys/bus/u4b/usb_hub.c @@ -158,7 +158,7 @@ static device_method_t uhub_methods[] = { DEVMETHOD(bus_child_location_str, uhub_child_location_string), DEVMETHOD(bus_child_pnpinfo_str, uhub_child_pnpinfo_string), DEVMETHOD(bus_driver_added, uhub_driver_added), - {0, 0} + DEVMETHOD_END }; static driver_t uhub_driver = { diff --git a/sys/bus/u4b/wlan/if_rum.c b/sys/bus/u4b/wlan/if_rum.c index 0e6883e89a..e3255fb5bc 100644 --- a/sys/bus/u4b/wlan/if_rum.c +++ b/sys/bus/u4b/wlan/if_rum.c @@ -2360,7 +2360,7 @@ static device_method_t rum_methods[] = { DEVMETHOD(device_attach, rum_attach), DEVMETHOD(device_detach, rum_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t rum_driver = { diff --git a/sys/bus/u4b/wlan/if_run.c b/sys/bus/u4b/wlan/if_run.c index 3e7563e89c..b9784709d5 100644 --- a/sys/bus/u4b/wlan/if_run.c +++ b/sys/bus/u4b/wlan/if_run.c @@ -4945,7 +4945,7 @@ static device_method_t run_methods[] = { DEVMETHOD(device_attach, run_attach), DEVMETHOD(device_detach, run_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t run_driver = { diff --git a/sys/bus/u4b/wlan/if_uath.c b/sys/bus/u4b/wlan/if_uath.c index 0e52951f61..39b01ebaa4 100644 --- a/sys/bus/u4b/wlan/if_uath.c +++ b/sys/bus/u4b/wlan/if_uath.c @@ -2885,7 +2885,7 @@ static device_method_t uath_methods[] = { DEVMETHOD(device_probe, uath_match), DEVMETHOD(device_attach, uath_attach), DEVMETHOD(device_detach, uath_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uath_driver = { "uath", diff --git a/sys/bus/u4b/wlan/if_upgt.c b/sys/bus/u4b/wlan/if_upgt.c index 12e0f89409..e61e3df47b 100644 --- a/sys/bus/u4b/wlan/if_upgt.c +++ b/sys/bus/u4b/wlan/if_upgt.c @@ -2378,7 +2378,7 @@ static device_method_t upgt_methods[] = { DEVMETHOD(device_attach, upgt_attach), DEVMETHOD(device_detach, upgt_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t upgt_driver = { diff --git a/sys/bus/u4b/wlan/if_ural.c b/sys/bus/u4b/wlan/if_ural.c index d48c07c2ee..7152eec9ea 100644 --- a/sys/bus/u4b/wlan/if_ural.c +++ b/sys/bus/u4b/wlan/if_ural.c @@ -383,7 +383,7 @@ static device_method_t ural_methods[] = { DEVMETHOD(device_attach, ural_attach), DEVMETHOD(device_detach, ural_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ural_driver = { diff --git a/sys/bus/u4b/wlan/if_urtw.c b/sys/bus/u4b/wlan/if_urtw.c index c7eec2e766..73e7396f57 100644 --- a/sys/bus/u4b/wlan/if_urtw.c +++ b/sys/bus/u4b/wlan/if_urtw.c @@ -4431,7 +4431,7 @@ static device_method_t urtw_methods[] = { DEVMETHOD(device_probe, urtw_match), DEVMETHOD(device_attach, urtw_attach), DEVMETHOD(device_detach, urtw_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t urtw_driver = { "urtw", diff --git a/sys/bus/u4b/wlan/if_zyd.c b/sys/bus/u4b/wlan/if_zyd.c index c8679d6e7a..c663646c88 100644 --- a/sys/bus/u4b/wlan/if_zyd.c +++ b/sys/bus/u4b/wlan/if_zyd.c @@ -2935,7 +2935,7 @@ static device_method_t zyd_methods[] = { DEVMETHOD(device_attach, zyd_attach), DEVMETHOD(device_detach, zyd_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t zyd_driver = { diff --git a/sys/bus/usb/ehci_pci.c b/sys/bus/usb/ehci_pci.c index 8779892f3a..0214909354 100644 --- a/sys/bus/usb/ehci_pci.c +++ b/sys/bus/usb/ehci_pci.c @@ -554,7 +554,7 @@ static device_method_t ehci_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }; static driver_t ehci_driver = { diff --git a/sys/bus/usb/ohci_pci.c b/sys/bus/usb/ohci_pci.c index bb93c57e6e..b99c09d3d1 100644 --- a/sys/bus/usb/ohci_pci.c +++ b/sys/bus/usb/ohci_pci.c @@ -384,7 +384,7 @@ static device_method_t ohci_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }; static driver_t ohci_driver = { diff --git a/sys/bus/usb/uhci_pci.c b/sys/bus/usb/uhci_pci.c index 9b48a7cc6a..6a4892afa9 100644 --- a/sys/bus/usb/uhci_pci.c +++ b/sys/bus/usb/uhci_pci.c @@ -481,7 +481,7 @@ static device_method_t uhci_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }; static driver_t uhci_driver = { diff --git a/sys/bus/usb/uhub.c b/sys/bus/usb/uhub.c index c7b6322205..8d56d8da4e 100644 --- a/sys/bus/usb/uhub.c +++ b/sys/bus/usb/uhub.c @@ -111,7 +111,7 @@ static kobj_method_t uhub_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0,0} + DEVMETHOD_END }; static driver_t uhub_driver = { @@ -137,7 +137,7 @@ static device_method_t uhubroot_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0,0} + DEVMETHOD_END }; static driver_t uhubroot_driver = { diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c index 49b0530346..6737075ee7 100644 --- a/sys/bus/usb/usb.c +++ b/sys/bus/usb/usb.c @@ -204,7 +204,7 @@ static kobj_method_t usb_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0,0} + DEVMETHOD_END }; static driver_t usb_driver = { diff --git a/sys/bus/usb/usb_port.h b/sys/bus/usb/usb_port.h index 0a133e68d1..cda408c251 100644 --- a/sys/bus/usb/usb_port.h +++ b/sys/bus/usb/usb_port.h @@ -2,7 +2,6 @@ * $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ * $NetBSD: usb_port.h,v 1.68 2005/07/30 06:14:50 skrll Exp $ * $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.65 2003/11/09 23:54:21 joe Exp $ - * $DragonFly: src/sys/bus/usb/usb_port.h,v 1.22 2008/05/26 12:37:44 mneumann Exp $ */ /* Also already merged from NetBSD: @@ -117,7 +116,7 @@ Static device_method_t __CONCAT(dname,_methods)[] = { \ DEVMETHOD(device_attach, __CONCAT(dname,_attach)), \ DEVMETHOD(device_detach, __CONCAT(dname,_detach)), \ init, \ - {0,0} \ + DEVMETHOD_END \ }; \ \ Static driver_t __CONCAT(dname,_driver) = { \ diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 0ce2b3f658..1aab9d1d00 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -199,7 +199,7 @@ static device_method_t acpi_methods[] = { /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_driver = { diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c index d22807570b..168284e50c 100644 --- a/sys/dev/acpica/acpi_acad.c +++ b/sys/dev/acpica/acpi_acad.c @@ -71,7 +71,7 @@ static device_method_t acpi_acad_methods[] = { DEVMETHOD(device_probe, acpi_acad_probe), DEVMETHOD(device_attach, acpi_acad_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_acad_driver = { diff --git a/sys/dev/acpica/acpi_asus/acpi_asus.c b/sys/dev/acpica/acpi_asus/acpi_asus.c index a64ad0a54d..bc630881cc 100644 --- a/sys/dev/acpica/acpi_asus/acpi_asus.c +++ b/sys/dev/acpica/acpi_asus/acpi_asus.c @@ -532,7 +532,7 @@ static device_method_t acpi_asus_methods[] = { 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_button.c b/sys/dev/acpica/acpi_button.c index 2d23554d9c..0bda461f07 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -79,7 +79,7 @@ static device_method_t acpi_button_methods[] = { DEVMETHOD(device_shutdown, acpi_button_suspend), DEVMETHOD(device_resume, acpi_button_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_button_driver = { diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c index 168b23ab3d..22038c9429 100644 --- a/sys/dev/acpica/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -94,7 +94,7 @@ static device_method_t acpi_cmbat_methods[] = { DEVMETHOD(acpi_batt_get_info, acpi_cmbat_bif), DEVMETHOD(acpi_batt_get_status, acpi_cmbat_bst), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_cmbat_driver = { diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index 093bf1a977..de7db65faf 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -81,7 +81,7 @@ static device_method_t acpi_cpu_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_cpu_driver = { diff --git a/sys/dev/acpica/acpi_cpu_cstate.c b/sys/dev/acpica/acpi_cpu_cstate.c index f70c2c5b76..0364001a76 100644 --- a/sys/dev/acpica/acpi_cpu_cstate.c +++ b/sys/dev/acpica/acpi_cpu_cstate.c @@ -187,7 +187,7 @@ static device_method_t acpi_cpu_cst_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_cpu_cst_driver = { diff --git a/sys/dev/acpica/acpi_cpu_pstate.c b/sys/dev/acpica/acpi_cpu_pstate.c index 6410b88389..aa0e588c2d 100644 --- a/sys/dev/acpica/acpi_cpu_pstate.c +++ b/sys/dev/acpica/acpi_cpu_pstate.c @@ -182,7 +182,7 @@ static device_method_t acpi_pst_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_pst_driver = { diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index aeab9e7a2f..e49611dc1b 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -251,7 +251,7 @@ static device_method_t acpi_ec_methods[] = { DEVMETHOD(acpi_ec_read, acpi_ec_read_method), DEVMETHOD(acpi_ec_write, acpi_ec_write_method), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_ec_driver = { diff --git a/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c index 5c28085004..4dc4c71e7b 100644 --- a/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c +++ b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c @@ -150,7 +150,7 @@ static device_method_t acpi_fujitsu_methods[] = { DEVMETHOD(device_detach, acpi_fujitsu_detach), DEVMETHOD(device_suspend, acpi_fujitsu_suspend), DEVMETHOD(device_resume, acpi_fujitsu_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_fujitsu_driver = { diff --git a/sys/dev/acpica/acpi_hp/acpi_hp.c b/sys/dev/acpica/acpi_hp/acpi_hp.c index c6a86759f9..8c454461d6 100644 --- a/sys/dev/acpica/acpi_hp/acpi_hp.c +++ b/sys/dev/acpica/acpi_hp/acpi_hp.c @@ -329,7 +329,7 @@ static device_method_t acpi_hp_methods[] = { DEVMETHOD(device_probe, acpi_hp_probe), DEVMETHOD(device_attach, acpi_hp_attach), DEVMETHOD(device_detach, acpi_hp_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_hp_driver = { diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 035e6ef49f..8c26f529a2 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -92,7 +92,7 @@ static device_method_t acpi_hpet_methods[] = { DEVMETHOD(device_attach, acpi_hpet_attach), DEVMETHOD(device_suspend, acpi_hpet_suspend), DEVMETHOD(device_resume, acpi_hpet_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_hpet_driver = { diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index fd4819809f..d1f90bcd7c 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -76,7 +76,7 @@ static device_method_t acpi_isab_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_isab_driver = { diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index 552445c9f8..a29114ca4d 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -68,7 +68,7 @@ static device_method_t acpi_lid_methods[] = { DEVMETHOD(device_suspend, acpi_lid_suspend), DEVMETHOD(device_resume, acpi_lid_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_lid_driver = { diff --git a/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c b/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c index 7853323b27..82b2ad7bd4 100644 --- a/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c +++ b/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c @@ -116,7 +116,7 @@ static device_method_t acpi_panasonic_methods[] = { DEVMETHOD(device_detach, acpi_panasonic_detach), DEVMETHOD(device_shutdown, acpi_panasonic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_panasonic_driver = { diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index 0ea5579112..f32fc08a47 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -95,7 +95,7 @@ static device_method_t acpi_pci_methods[] = { /* PCI interface */ DEVMETHOD(pci_set_powerstate, acpi_pci_set_powerstate_method), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pci_devclass; diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 83235c2798..e55a0f87f3 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -1106,7 +1106,7 @@ static device_method_t acpi_pci_link_methods[] = { DEVMETHOD(device_attach, acpi_pci_link_attach), DEVMETHOD(device_resume, acpi_pci_link_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_pci_link_driver = { diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 3935586c5b..359c526392 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -115,7 +115,7 @@ static device_method_t acpi_pcib_acpi_methods[] = { DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c index f15f262255..048416e2d9 100644 --- a/sys/dev/acpica/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -80,7 +80,7 @@ static device_method_t acpi_pcib_pci_methods[] = { /* pcib interface */ DEVMETHOD(pcib_route_interrupt, acpi_pcib_pci_route_interrupt), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 2283c53269..bbfd49917a 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -682,7 +682,7 @@ static device_method_t acpi_sysres_methods[] = { DEVMETHOD(device_probe, acpi_sysres_probe), DEVMETHOD(device_attach, acpi_sysres_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_sysres_driver = { diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c index f2fb5d4b1d..dc2282fbb5 100644 --- a/sys/dev/acpica/acpi_smbat.c +++ b/sys/dev/acpica/acpi_smbat.c @@ -88,7 +88,7 @@ static device_method_t acpi_smbat_methods[] = { DEVMETHOD(acpi_batt_get_status, acpi_smbat_get_bst), DEVMETHOD(acpi_batt_get_info, acpi_smbat_get_bif), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_smbat_driver = { diff --git a/sys/dev/acpica/acpi_sony/acpi_sony.c b/sys/dev/acpica/acpi_sony/acpi_sony.c index 165184f9f1..8438c8b77c 100644 --- a/sys/dev/acpica/acpi_sony/acpi_sony.c +++ b/sys/dev/acpica/acpi_sony/acpi_sony.c @@ -96,7 +96,7 @@ static device_method_t acpi_sony_methods[] = { DEVMETHOD(device_attach, acpi_sony_attach), DEVMETHOD(device_detach, acpi_sony_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_sony_driver = { diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c index ef64c8b7ed..909e837acf 100644 --- a/sys/dev/acpica/acpi_thermal.c +++ b/sys/dev/acpica/acpi_thermal.c @@ -154,7 +154,7 @@ static device_method_t acpi_tz_methods[] = { DEVMETHOD(device_probe, acpi_tz_probe), DEVMETHOD(device_attach, acpi_tz_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_tz_driver = { diff --git a/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c b/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c index b84ccba199..56d4abe950 100644 --- a/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c +++ b/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c @@ -276,7 +276,7 @@ static device_method_t acpi_thinkpad_methods[] = { DEVMETHOD(device_probe, acpi_thinkpad_probe), DEVMETHOD(device_attach, acpi_thinkpad_attach), DEVMETHOD(device_detach, acpi_thinkpad_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_thinkpad_driver = { diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 2cfe6b8c31..37ba2c221a 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -92,7 +92,7 @@ static device_method_t acpi_timer_methods[] = { DEVMETHOD(device_probe, acpi_timer_probe), DEVMETHOD(device_attach, acpi_timer_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_timer_driver = { diff --git a/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c b/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c index b4832f86ee..6e1d88a8fb 100644 --- a/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c +++ b/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c @@ -170,7 +170,7 @@ static device_method_t acpi_toshiba_methods[] = { DEVMETHOD(device_attach, acpi_toshiba_attach), DEVMETHOD(device_detach, acpi_toshiba_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_toshiba_driver = { @@ -188,7 +188,7 @@ static device_method_t acpi_toshiba_video_methods[] = { DEVMETHOD(device_probe, acpi_toshiba_video_probe), DEVMETHOD(device_attach, acpi_toshiba_video_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_toshiba_video_driver = { diff --git a/sys/dev/acpica/acpi_video/acpi_video.c b/sys/dev/acpica/acpi_video/acpi_video.c index 298a25fc4e..2b1cc8e94a 100644 --- a/sys/dev/acpica/acpi_video/acpi_video.c +++ b/sys/dev/acpica/acpi_video/acpi_video.c @@ -145,7 +145,7 @@ static device_method_t acpi_video_methods[] = { DEVMETHOD(device_attach, acpi_video_attach), DEVMETHOD(device_detach, acpi_video_detach), DEVMETHOD(device_shutdown, acpi_video_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t acpi_video_driver = { diff --git a/sys/dev/acpica/acpi_wmi/acpi_wmi.c b/sys/dev/acpica/acpi_wmi/acpi_wmi.c index 860706500f..196a64d2b9 100644 --- a/sys/dev/acpica/acpi_wmi/acpi_wmi.c +++ b/sys/dev/acpica/acpi_wmi/acpi_wmi.c @@ -187,7 +187,7 @@ static device_method_t acpi_wmi_methods[] = { DEVMETHOD(acpi_wmi_get_block, acpi_wmi_get_block_method), DEVMETHOD(acpi_wmi_set_block, acpi_wmi_set_block_method), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_wmi_driver = { diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c index 8f6aa71af9..a1ab36aa10 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_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 fb826068ec..6afe985937 100644 --- a/sys/dev/agp/agp_amd.c +++ b/sys/dev/agp/agp_amd.c @@ -380,7 +380,7 @@ static device_method_t agp_amd_methods[] = { 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 2b640bd44b..b9e798d5f5 100644 --- a/sys/dev/agp/agp_amd64.c +++ b/sys/dev/agp/agp_amd64.c @@ -496,7 +496,7 @@ static device_method_t agp_amd64_methods[] = { 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_ati.c b/sys/dev/agp/agp_ati.c index c4238b0134..a3b13a2365 100644 --- a/sys/dev/agp/agp_ati.c +++ b/sys/dev/agp/agp_ati.c @@ -370,7 +370,7 @@ static device_method_t agp_ati_methods[] = { 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 7f661653bd..8062092f82 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -2128,7 +2128,7 @@ static device_method_t agp_i810_methods[] = { 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 d29005580e..39b69063df 100644 --- a/sys/dev/agp/agp_intel.c +++ b/sys/dev/agp/agp_intel.c @@ -422,7 +422,7 @@ static device_method_t agp_intel_methods[] = { 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 4bc1be80b6..f0ecce8d96 100644 --- a/sys/dev/agp/agp_nvidia.c +++ b/sys/dev/agp/agp_nvidia.c @@ -434,7 +434,7 @@ static device_method_t agp_nvidia_methods[] = { 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 263eaeb3ad..04b2ab48c0 100644 --- a/sys/dev/agp/agp_sis.c +++ b/sys/dev/agp/agp_sis.c @@ -272,7 +272,7 @@ static device_method_t agp_sis_methods[] = { 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 9a2bd82fd3..eb58581aea 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_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/crypto/aesni/aesni.c b/sys/dev/crypto/aesni/aesni.c index 4db11849fb..a4919d58ce 100644 --- a/sys/dev/crypto/aesni/aesni.c +++ b/sys/dev/crypto/aesni/aesni.c @@ -338,7 +338,7 @@ static device_method_t aesni_methods[] = { DEVMETHOD(cryptodev_freesession, aesni_freesession), DEVMETHOD(cryptodev_process, aesni_process), - {0, 0}, + DEVMETHOD_END }; static driver_t aesni_driver = { diff --git a/sys/dev/crypto/glxsb/glxsb.c b/sys/dev/crypto/glxsb/glxsb.c index 651bed8782..80db5ec1cc 100644 --- a/sys/dev/crypto/glxsb/glxsb.c +++ b/sys/dev/crypto/glxsb/glxsb.c @@ -229,7 +229,7 @@ static device_method_t glxsb_methods[] = { DEVMETHOD(cryptodev_freesession, glxsb_crypto_freesession), DEVMETHOD(cryptodev_process, glxsb_crypto_process), - {0,0} + DEVMETHOD_END }; static driver_t glxsb_driver = { diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c index 71984c5c47..b3adf47dae 100644 --- a/sys/dev/crypto/hifn/hifn7751.c +++ b/sys/dev/crypto/hifn/hifn7751.c @@ -141,7 +141,7 @@ static device_method_t hifn_methods[] = { DEVMETHOD(cryptodev_freesession,hifn_freesession), DEVMETHOD(cryptodev_process, hifn_process), - { 0, 0 } + DEVMETHOD_END }; static driver_t hifn_driver = { "hifn", diff --git a/sys/dev/crypto/padlock/padlock.c b/sys/dev/crypto/padlock/padlock.c index 426864e333..96e663ea4f 100644 --- a/sys/dev/crypto/padlock/padlock.c +++ b/sys/dev/crypto/padlock/padlock.c @@ -411,7 +411,7 @@ static device_method_t padlock_methods[] = { DEVMETHOD(cryptodev_freesession,padlock_freesession), DEVMETHOD(cryptodev_process, padlock_process), - {0, 0}, + DEVMETHOD_END }; static driver_t padlock_driver = { diff --git a/sys/dev/crypto/rdrand/rdrand.c b/sys/dev/crypto/rdrand/rdrand.c index d0c1e7548e..d828536d7b 100644 --- a/sys/dev/crypto/rdrand/rdrand.c +++ b/sys/dev/crypto/rdrand/rdrand.c @@ -139,7 +139,7 @@ static device_method_t rdrand_methods[] = { DEVMETHOD(device_attach, rdrand_attach), DEVMETHOD(device_detach, rdrand_detach), - {0, 0}, + DEVMETHOD_END }; diff --git a/sys/dev/crypto/safe/safe.c b/sys/dev/crypto/safe/safe.c index af89e1885c..648c7dd126 100644 --- a/sys/dev/crypto/safe/safe.c +++ b/sys/dev/crypto/safe/safe.c @@ -104,7 +104,7 @@ static device_method_t safe_methods[] = { DEVMETHOD(cryptodev_freesession,safe_freesession), DEVMETHOD(cryptodev_process, safe_process), - { 0, 0 } + DEVMETHOD_END }; static driver_t safe_driver = { "safe", diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c index ce5e5585b1..e711c806f6 100644 --- a/sys/dev/crypto/ubsec/ubsec.c +++ b/sys/dev/crypto/ubsec/ubsec.c @@ -156,7 +156,7 @@ static device_method_t ubsec_methods[] = { DEVMETHOD(cryptodev_process, ubsec_process), DEVMETHOD(cryptodev_kprocess, ubsec_kprocess), - { 0, 0 } + DEVMETHOD_END }; static driver_t ubsec_driver = { "ubsec", diff --git a/sys/dev/disk/advansys/adv_isa.c b/sys/dev/disk/advansys/adv_isa.c index 9d5715c5a5..a960a40913 100644 --- a/sys/dev/disk/advansys/adv_isa.c +++ b/sys/dev/disk/advansys/adv_isa.c @@ -406,7 +406,7 @@ static device_method_t adv_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, adv_isa_probe), DEVMETHOD(device_attach, adv_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t adv_isa_driver = { diff --git a/sys/dev/disk/advansys/adv_pci.c b/sys/dev/disk/advansys/adv_pci.c index d2f59207f8..20a90575e4 100644 --- a/sys/dev/disk/advansys/adv_pci.c +++ b/sys/dev/disk/advansys/adv_pci.c @@ -303,7 +303,7 @@ static device_method_t adv_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, adv_pci_probe), DEVMETHOD(device_attach, adv_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t adv_pci_driver = { diff --git a/sys/dev/disk/advansys/adw_pci.c b/sys/dev/disk/advansys/adw_pci.c index 71728d95d1..3fa0f736b7 100644 --- a/sys/dev/disk/advansys/adw_pci.c +++ b/sys/dev/disk/advansys/adw_pci.c @@ -126,7 +126,7 @@ static device_method_t adw_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, adw_pci_probe), DEVMETHOD(device_attach, adw_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t adw_pci_driver = { diff --git a/sys/dev/disk/ahci/ahci_dragonfly.c b/sys/dev/disk/ahci/ahci_dragonfly.c index 0ecc69f4ea..d320f5bee2 100644 --- a/sys/dev/disk/ahci/ahci_dragonfly.c +++ b/sys/dev/disk/ahci/ahci_dragonfly.c @@ -70,7 +70,7 @@ static device_method_t ahci_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - {0, 0} + DEVMETHOD_END }; static devclass_t ahci_devclass; diff --git a/sys/dev/disk/aic/aic_pccard.c b/sys/dev/disk/aic/aic_pccard.c index 0c9032dd86..ac41d13671 100644 --- a/sys/dev/disk/aic/aic_pccard.c +++ b/sys/dev/disk/aic/aic_pccard.c @@ -177,7 +177,7 @@ static device_method_t aic_pccard_methods[] = { DEVMETHOD(device_attach, aic_pccard_attach), DEVMETHOD(device_detach, aic_pccard_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t aic_pccard_driver = { diff --git a/sys/dev/disk/aic7xxx/ahc_pci.c b/sys/dev/disk/aic7xxx/ahc_pci.c index 8a3d76de8f..2c10b33aef 100644 --- a/sys/dev/disk/aic7xxx/ahc_pci.c +++ b/sys/dev/disk/aic7xxx/ahc_pci.c @@ -43,7 +43,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/disk/aic7xxx/ahd_pci.c b/sys/dev/disk/aic7xxx/ahd_pci.c index 2e452daa1b..76e99c5fc8 100644 --- a/sys/dev/disk/aic7xxx/ahd_pci.c +++ b/sys/dev/disk/aic7xxx/ahd_pci.c @@ -43,7 +43,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/disk/amd/amd.c b/sys/dev/disk/amd/amd.c index 15f4895698..4944b0c53a 100644 --- a/sys/dev/disk/amd/amd.c +++ b/sys/dev/disk/amd/amd.c @@ -2462,7 +2462,7 @@ static device_method_t amd_methods[] = { /* Device interface */ DEVMETHOD(device_probe, amd_probe), DEVMETHOD(device_attach, amd_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t amd_driver = { diff --git a/sys/dev/disk/buslogic/bt_pci.c b/sys/dev/disk/buslogic/bt_pci.c index b6e5bd0282..664466ff8e 100644 --- a/sys/dev/disk/buslogic/bt_pci.c +++ b/sys/dev/disk/buslogic/bt_pci.c @@ -167,7 +167,7 @@ static device_method_t bt_pci_methods[] = { DEVMETHOD(device_probe, bt_pci_probe), DEVMETHOD(device_attach, bt_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t bt_pci_driver = { diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c index 507c56e054..5b50162524 100644 --- a/sys/dev/disk/fd/fd.c +++ b/sys/dev/disk/fd/fd.c @@ -844,7 +844,7 @@ static device_method_t fdc_methods[] = { DEVMETHOD(bus_read_ivar, fdc_read_ivar), /* Our children never use any other bus interface methods. */ - { 0, 0 } + DEVMETHOD_END }; static driver_t fdc_driver = { @@ -1093,7 +1093,7 @@ static device_method_t fd_methods[] = { 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/disk/fd/fd_pccard.c b/sys/dev/disk/fd/fd_pccard.c index 82e4f088ab..d4e96e4966 100644 --- a/sys/dev/disk/fd/fd_pccard.c +++ b/sys/dev/disk/fd/fd_pccard.c @@ -171,7 +171,7 @@ static device_method_t fdc_pccard_methods[] = { DEVMETHOD(bus_read_ivar, fdc_read_ivar), /* Our children never use any other bus interface methods. */ - { 0, 0 } + DEVMETHOD_END }; static driver_t fdc_pccard_driver = { diff --git a/sys/dev/disk/isp/isp_pci.c b/sys/dev/disk/isp/isp_pci.c index 3ec9eef1b2..a9e594e0ba 100644 --- a/sys/dev/disk/isp/isp_pci.c +++ b/sys/dev/disk/isp/isp_pci.c @@ -359,7 +359,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/disk/mmcsd/mmcsd.c b/sys/dev/disk/mmcsd/mmcsd.c index 4b7cea1726..bd29cc8b77 100644 --- a/sys/dev/disk/mmcsd/mmcsd.c +++ b/sys/dev/disk/mmcsd/mmcsd.c @@ -576,7 +576,7 @@ static device_method_t mmcsd_methods[] = { DEVMETHOD(device_detach, mmcsd_detach), DEVMETHOD(device_suspend, mmcsd_suspend), DEVMETHOD(device_resume, mmcsd_resume), - {0, 0}, + DEVMETHOD_END }; static driver_t mmcsd_driver = { diff --git a/sys/dev/disk/mpt/mpt_pci.c b/sys/dev/disk/mpt/mpt_pci.c index fe123eb1bb..24fe9d9509 100644 --- a/sys/dev/disk/mpt/mpt_pci.c +++ b/sys/dev/disk/mpt/mpt_pci.c @@ -163,7 +163,7 @@ static device_method_t mpt_methods[] = { DEVMETHOD(device_attach, mpt_pci_attach), DEVMETHOD(device_detach, mpt_pci_detach), DEVMETHOD(device_shutdown, mpt_pci_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t mpt_driver = { diff --git a/sys/dev/disk/nata/ata-card.c b/sys/dev/disk/nata/ata-card.c index 11db71f80d..68881c8afb 100644 --- a/sys/dev/disk/nata/ata-card.c +++ b/sys/dev/disk/nata/ata-card.c @@ -150,7 +150,7 @@ static device_method_t ata_pccard_methods[] = { DEVMETHOD(device_attach, ata_pccard_attach), DEVMETHOD(device_detach, ata_pccard_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_pccard_driver = { diff --git a/sys/dev/disk/nata/ata-disk.c b/sys/dev/disk/nata/ata-disk.c index fe48d3ea7f..23ad52def1 100644 --- a/sys/dev/disk/nata/ata-disk.c +++ b/sys/dev/disk/nata/ata-disk.c @@ -514,7 +514,7 @@ static device_method_t ad_methods[] = { /* ATA methods */ DEVMETHOD(ata_reinit, ad_reinit), - { 0, 0 } + DEVMETHOD_END }; static driver_t ad_driver = { diff --git a/sys/dev/disk/nata/ata-isa.c b/sys/dev/disk/nata/ata-isa.c index 0f1a8d0bf6..91cea685fa 100644 --- a/sys/dev/disk/nata/ata-isa.c +++ b/sys/dev/disk/nata/ata-isa.c @@ -106,7 +106,7 @@ static device_method_t ata_isa_methods[] = { DEVMETHOD(device_suspend, ata_suspend), DEVMETHOD(device_resume, ata_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_isa_driver = { diff --git a/sys/dev/disk/nata/ata-pci.c b/sys/dev/disk/nata/ata-pci.c index 2d795368a9..60edaf34c2 100644 --- a/sys/dev/disk/nata/ata-pci.c +++ b/sys/dev/disk/nata/ata-pci.c @@ -617,7 +617,7 @@ static device_method_t ata_pci_methods[] = { DEVMETHOD(bus_setup_intr, ata_pci_setup_intr), DEVMETHOD(bus_teardown_intr, ata_pci_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; devclass_t atapci_devclass; @@ -753,7 +753,7 @@ static device_method_t ata_pcichannel_methods[] = { DEVMETHOD(ata_locking, ata_pcichannel_locking), DEVMETHOD(ata_reset, ata_pcichannel_reset), - { 0, 0 } + DEVMETHOD_END }; driver_t ata_pcichannel_driver = { diff --git a/sys/dev/disk/nata/ata-raid.c b/sys/dev/disk/nata/ata-raid.c index 1b3a96a4c4..cb3b9f3761 100644 --- a/sys/dev/disk/nata/ata-raid.c +++ b/sys/dev/disk/nata/ata-raid.c @@ -4166,7 +4166,7 @@ static device_method_t ata_raid_sub_methods[] = { DEVMETHOD(device_probe, ata_raid_subdisk_probe), DEVMETHOD(device_attach, ata_raid_subdisk_attach), DEVMETHOD(device_detach, ata_raid_subdisk_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_raid_sub_driver = { diff --git a/sys/dev/disk/nata/ata-usb.c b/sys/dev/disk/nata/ata-usb.c index 186a20c8e4..008e11d45b 100644 --- a/sys/dev/disk/nata/ata-usb.c +++ b/sys/dev/disk/nata/ata-usb.c @@ -151,7 +151,7 @@ static kobj_method_t atausb_methods[] = { DEVMETHOD(device_probe, atausb_match), DEVMETHOD(device_attach, atausb_attach), DEVMETHOD(device_detach, atausb_detach), - {0,0} + DEVMETHOD_END }; static driver_t atausb_driver = { @@ -976,7 +976,7 @@ static device_method_t ata_usbchannel_methods[] = { DEVMETHOD(ata_locking, ata_usbchannel_locking), /* DEVMETHOD(ata_reset, ata_usbchannel_reset), */ - { 0, 0 } + DEVMETHOD_END }; static driver_t ata_usbchannel_driver = { diff --git a/sys/dev/disk/nata/atapi-cam.c b/sys/dev/disk/nata/atapi-cam.c index 7a548aa880..8fadcfa3b6 100644 --- a/sys/dev/disk/nata/atapi-cam.c +++ b/sys/dev/disk/nata/atapi-cam.c @@ -126,7 +126,7 @@ static device_method_t atapi_cam_methods[] = { DEVMETHOD(device_attach, atapi_cam_attach), DEVMETHOD(device_detach, atapi_cam_detach), DEVMETHOD(ata_reinit, atapi_cam_reinit), - {0, 0} + DEVMETHOD_END }; static driver_t atapi_cam_driver = { diff --git a/sys/dev/disk/nata/atapi-cd.c b/sys/dev/disk/nata/atapi-cd.c index ed8a7f8783..dc054195fb 100644 --- a/sys/dev/disk/nata/atapi-cd.c +++ b/sys/dev/disk/nata/atapi-cd.c @@ -1991,7 +1991,7 @@ static device_method_t acd_methods[] = { /* ATA methods */ DEVMETHOD(ata_reinit, acd_reinit), - { 0, 0 } + DEVMETHOD_END }; static driver_t acd_driver = { diff --git a/sys/dev/disk/nata/atapi-fd.c b/sys/dev/disk/nata/atapi-fd.c index 2f117533a4..29672a329c 100644 --- a/sys/dev/disk/nata/atapi-fd.c +++ b/sys/dev/disk/nata/atapi-fd.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.109 2006/03/30 05:29:57 marcel Exp $ - * $DragonFly: src/sys/dev/disk/nata/atapi-fd.c,v 1.5 2008/08/30 02:56:11 dillon Exp $ */ #include @@ -474,7 +473,7 @@ static device_method_t afd_methods[] = { /* ATA methods */ DEVMETHOD(ata_reinit, afd_reinit), - { 0, 0 } + DEVMETHOD_END }; static driver_t afd_driver = { diff --git a/sys/dev/disk/nata/atapi-tape.c b/sys/dev/disk/nata/atapi-tape.c index 614f1ce3a1..5d334f2a03 100644 --- a/sys/dev/disk/nata/atapi-tape.c +++ b/sys/dev/disk/nata/atapi-tape.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.101 2006/01/05 21:27:19 sos Exp $ - * $DragonFly: src/sys/dev/disk/nata/atapi-tape.c,v 1.4 2008/08/30 02:56:11 dillon Exp $ */ #include "opt_ata.h" @@ -751,7 +750,7 @@ static device_method_t ast_methods[] = { /* ATA methods */ DEVMETHOD(ata_reinit, ast_reinit), - { 0, 0 } + DEVMETHOD_END }; static driver_t ast_driver = { diff --git a/sys/dev/disk/ncr/ncr.c b/sys/dev/disk/ncr/ncr.c index 338bbc414a..2a5b888a77 100644 --- a/sys/dev/disk/ncr/ncr.c +++ b/sys/dev/disk/ncr/ncr.c @@ -7150,7 +7150,7 @@ static device_method_t ncr_methods[] = { DEVMETHOD(device_probe, ncr_probe), DEVMETHOD(device_attach, ncr_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ncr_driver = { diff --git a/sys/dev/disk/ncv/ncr53c500_pccard.c b/sys/dev/disk/ncv/ncr53c500_pccard.c index 7a27c3b82d..2e2c8ab8b1 100644 --- a/sys/dev/disk/ncv/ncr53c500_pccard.c +++ b/sys/dev/disk/ncv/ncr53c500_pccard.c @@ -294,7 +294,7 @@ static device_method_t ncv_pccard_methods[] = { DEVMETHOD(card_compat_probe, ncv_pccard_probe), DEVMETHOD(card_compat_attach, ncv_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ncv_pccard_driver = { diff --git a/sys/dev/disk/nsp/nsp_pccard.c b/sys/dev/disk/nsp/nsp_pccard.c index d9f31adeb1..111673f9ca 100644 --- a/sys/dev/disk/nsp/nsp_pccard.c +++ b/sys/dev/disk/nsp/nsp_pccard.c @@ -250,7 +250,7 @@ static device_method_t nsp_pccard_methods[] = { DEVMETHOD(card_compat_probe, nsp_pccard_probe), DEVMETHOD(card_compat_attach, nsp_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t nsp_pccard_driver = { diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c index a6d792b98a..659a708e9e 100644 --- a/sys/dev/disk/sbp/sbp.c +++ b/sys/dev/disk/sbp/sbp.c @@ -2738,7 +2738,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/disk/sdhci/sdhci.c b/sys/dev/disk/sdhci/sdhci.c index 3deea9d9fe..73ac442252 100644 --- a/sys/dev/disk/sdhci/sdhci.c +++ b/sys/dev/disk/sdhci/sdhci.c @@ -1561,7 +1561,7 @@ static device_method_t sdhci_methods[] = { DEVMETHOD(mmcbr_acquire_host, sdhci_acquire_host), DEVMETHOD(mmcbr_release_host, sdhci_release_host), - {0, 0}, + DEVMETHOD_END }; static driver_t sdhci_driver = { diff --git a/sys/dev/disk/sili/sili_dragonfly.c b/sys/dev/disk/sili/sili_dragonfly.c index c0c74fb743..c2caac012e 100644 --- a/sys/dev/disk/sili/sili_dragonfly.c +++ b/sys/dev/disk/sili/sili_dragonfly.c @@ -69,7 +69,7 @@ static device_method_t sili_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - {0, 0} + DEVMETHOD_END }; static devclass_t sili_devclass; diff --git a/sys/dev/disk/stg/tmc18c30_isa.c b/sys/dev/disk/stg/tmc18c30_isa.c index 4879c5b5bd..8de647c931 100644 --- a/sys/dev/disk/stg/tmc18c30_isa.c +++ b/sys/dev/disk/stg/tmc18c30_isa.c @@ -211,7 +211,7 @@ static device_method_t stg_isa_methods[] = { DEVMETHOD(device_attach, stg_isa_attach), DEVMETHOD(device_detach, stg_isa_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t stg_isa_driver = { diff --git a/sys/dev/disk/stg/tmc18c30_pccard.c b/sys/dev/disk/stg/tmc18c30_pccard.c index deff76f9ff..c8bc37566e 100644 --- a/sys/dev/disk/stg/tmc18c30_pccard.c +++ b/sys/dev/disk/stg/tmc18c30_pccard.c @@ -246,7 +246,7 @@ static device_method_t stg_pccard_methods[] = { DEVMETHOD(card_compat_probe, stg_pccard_probe), DEVMETHOD(card_compat_attach, stg_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t stg_pccard_driver = { diff --git a/sys/dev/disk/sym/sym_hipd.c b/sys/dev/disk/sym/sym_hipd.c index 1b11a491f3..6c2925c9a7 100644 --- a/sys/dev/disk/sym/sym_hipd.c +++ b/sys/dev/disk/sym/sym_hipd.c @@ -8359,7 +8359,7 @@ sym_update_dflags(hcb_p np, u_char *flags, struct ccb_trans_settings *cts) static device_method_t sym_pci_methods[] = { DEVMETHOD(device_probe, sym_pci_probe), DEVMETHOD(device_attach, sym_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sym_pci_driver = { diff --git a/sys/dev/disk/trm/trm.c b/sys/dev/disk/trm/trm.c index e23f7beeba..5dbcce62c4 100644 --- a/sys/dev/disk/trm/trm.c +++ b/sys/dev/disk/trm/trm.c @@ -3722,7 +3722,7 @@ static device_method_t trm_methods[] = { DEVMETHOD(device_probe, trm_probe), DEVMETHOD(device_attach, trm_attach), DEVMETHOD(device_detach, trm_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t trm_driver = { diff --git a/sys/dev/disk/vpo/vpo.c b/sys/dev/disk/vpo/vpo.c index da01e70cf9..2eeab1115f 100644 --- a/sys/dev/disk/vpo/vpo.c +++ b/sys/dev/disk/vpo/vpo.c @@ -448,7 +448,7 @@ static device_method_t vpo_methods[] = { DEVMETHOD(device_identify, bus_generic_identify), DEVMETHOD(device_probe, vpo_probe), DEVMETHOD(device_attach, vpo_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t vpo_driver = { diff --git a/sys/dev/drm/i915/i915_drv.c b/sys/dev/drm/i915/i915_drv.c index fbf35f6882..3620e3f4bb 100644 --- a/sys/dev/drm/i915/i915_drv.c +++ b/sys/dev/drm/i915/i915_drv.c @@ -140,7 +140,7 @@ static device_method_t i915_methods[] = { DEVMETHOD(device_resume, i915_resume), DEVMETHOD(device_detach, i915_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t i915_driver = { diff --git a/sys/dev/drm/mach64/mach64_drv.c b/sys/dev/drm/mach64/mach64_drv.c index efbff3f9f2..288c2e5e21 100644 --- a/sys/dev/drm/mach64/mach64_drv.c +++ b/sys/dev/drm/mach64/mach64_drv.c @@ -116,7 +116,7 @@ static device_method_t mach64_methods[] = { DEVMETHOD(device_attach, mach64_attach), DEVMETHOD(device_detach, mach64_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t mach64_driver = { diff --git a/sys/dev/drm/mga/mga_drv.c b/sys/dev/drm/mga/mga_drv.c index 1f965a447c..d93f5fc8ee 100644 --- a/sys/dev/drm/mga/mga_drv.c +++ b/sys/dev/drm/mga/mga_drv.c @@ -154,7 +154,7 @@ static device_method_t mga_methods[] = { DEVMETHOD(device_attach, mga_attach), DEVMETHOD(device_detach, mga_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t mga_driver = { diff --git a/sys/dev/drm/r128/r128_drv.c b/sys/dev/drm/r128/r128_drv.c index 864f0ec355..cec6eb754b 100644 --- a/sys/dev/drm/r128/r128_drv.c +++ b/sys/dev/drm/r128/r128_drv.c @@ -115,7 +115,7 @@ static device_method_t r128_methods[] = { DEVMETHOD(device_attach, r128_attach), DEVMETHOD(device_detach, r128_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t r128_driver = { diff --git a/sys/dev/drm/radeon/radeon_drv.c b/sys/dev/drm/radeon/radeon_drv.c index 892973c6f9..79a57064fc 100644 --- a/sys/dev/drm/radeon/radeon_drv.c +++ b/sys/dev/drm/radeon/radeon_drv.c @@ -114,7 +114,7 @@ static device_method_t radeon_methods[] = { DEVMETHOD(device_attach, radeon_attach), DEVMETHOD(device_detach, radeon_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t radeon_driver = { diff --git a/sys/dev/drm/savage/savage_drv.c b/sys/dev/drm/savage/savage_drv.c index e8df7c87c2..47e8aa710f 100644 --- a/sys/dev/drm/savage/savage_drv.c +++ b/sys/dev/drm/savage/savage_drv.c @@ -100,7 +100,7 @@ static device_method_t savage_methods[] = { DEVMETHOD(device_attach, savage_attach), DEVMETHOD(device_detach, savage_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t savage_driver = { diff --git a/sys/dev/drm/sis/sis_drv.c b/sys/dev/drm/sis/sis_drv.c index 39198f4d5a..67e5f1c400 100644 --- a/sys/dev/drm/sis/sis_drv.c +++ b/sys/dev/drm/sis/sis_drv.c @@ -94,7 +94,7 @@ static device_method_t sis_methods[] = { DEVMETHOD(device_attach, sis_attach), DEVMETHOD(device_detach, sis_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sis_driver = { diff --git a/sys/dev/drm/tdfx/tdfx_drv.c b/sys/dev/drm/tdfx/tdfx_drv.c index 3c8bb423b0..b215d10fab 100644 --- a/sys/dev/drm/tdfx/tdfx_drv.c +++ b/sys/dev/drm/tdfx/tdfx_drv.c @@ -96,7 +96,7 @@ static device_method_t tdfx_methods[] = { DEVMETHOD(device_attach, tdfx_attach), DEVMETHOD(device_detach, tdfx_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t tdfx_driver = { diff --git a/sys/dev/misc/amdsbwd/amdsbwd.c b/sys/dev/misc/amdsbwd/amdsbwd.c index 3de3e564f5..1d49998f52 100644 --- a/sys/dev/misc/amdsbwd/amdsbwd.c +++ b/sys/dev/misc/amdsbwd/amdsbwd.c @@ -138,7 +138,7 @@ static device_method_t amdsbwd_methods[] = { #if 0 DEVMETHOD(device_shutdown, amdsbwd_detach), #endif - {0, 0} + DEVMETHOD_END }; static devclass_t amdsbwd_devclass; diff --git a/sys/dev/misc/atkbd/atkbd_isa.c b/sys/dev/misc/atkbd/atkbd_isa.c index afede14c89..56273bfda9 100644 --- a/sys/dev/misc/atkbd/atkbd_isa.c +++ b/sys/dev/misc/atkbd/atkbd_isa.c @@ -67,7 +67,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/misc/atkbdc_layer/atkbdc_isa.c b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c index 5b42626642..fa17759822 100644 --- a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c +++ b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c @@ -87,7 +87,7 @@ static device_method_t atkbdc_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t atkbdc_driver = { diff --git a/sys/dev/misc/cmx/cmx_pccard.c b/sys/dev/misc/cmx/cmx_pccard.c index 0b7a1967be..84694573cb 100644 --- a/sys/dev/misc/cmx/cmx_pccard.c +++ b/sys/dev/misc/cmx/cmx_pccard.c @@ -97,7 +97,7 @@ static device_method_t cmx_pccard_methods[] = { DEVMETHOD(device_attach, cmx_pccard_attach), DEVMETHOD(device_detach, cmx_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cmx_pccard_driver = { diff --git a/sys/dev/misc/dcons/dcons_crom.c b/sys/dev/misc/dcons/dcons_crom.c index 6d8ac4533e..b64b4b2a32 100644 --- a/sys/dev/misc/dcons/dcons_crom.c +++ b/sys/dev/misc/dcons/dcons_crom.c @@ -33,7 +33,6 @@ * * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $ * $FreeBSD: src/sys/dev/dcons/dcons_crom.c,v 1.5 2004/10/13 05:38:42 simokawa Exp $ - * $DragonFly: src/sys/dev/misc/dcons/dcons_crom.c,v 1.5 2006/12/22 23:26:17 swildner Exp $ */ #include @@ -226,7 +225,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/misc/ecc/ecc_amd8000.c b/sys/dev/misc/ecc/ecc_amd8000.c index 35278c10a4..f8acf3f389 100644 --- a/sys/dev/misc/ecc/ecc_amd8000.c +++ b/sys/dev/misc/ecc/ecc_amd8000.c @@ -79,7 +79,7 @@ static device_method_t ecc_amd8000_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 ecc_amd8000_driver = { diff --git a/sys/dev/misc/ecc/ecc_e31200.c b/sys/dev/misc/ecc/ecc_e31200.c index 27149bcbf7..3a71ba7536 100644 --- a/sys/dev/misc/ecc/ecc_e31200.c +++ b/sys/dev/misc/ecc/ecc_e31200.c @@ -92,7 +92,7 @@ static device_method_t ecc_e31200_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 ecc_e31200_driver = { diff --git a/sys/dev/misc/ecc/ecc_x3400.c b/sys/dev/misc/ecc/ecc_x3400.c index 268fdfaf5b..9b00080826 100644 --- a/sys/dev/misc/ecc/ecc_x3400.c +++ b/sys/dev/misc/ecc/ecc_x3400.c @@ -102,7 +102,7 @@ static device_method_t ecc_x3400_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 ecc_x3400_driver = { diff --git a/sys/dev/misc/ichwd/ichwd.c b/sys/dev/misc/ichwd/ichwd.c index d99830f192..c4158541a1 100644 --- a/sys/dev/misc/ichwd/ichwd.c +++ b/sys/dev/misc/ichwd/ichwd.c @@ -621,7 +621,7 @@ static device_method_t ichwd_methods[] = { DEVMETHOD(device_attach, ichwd_attach), DEVMETHOD(device_detach, ichwd_detach), DEVMETHOD(device_shutdown, ichwd_detach), - {0,0} + DEVMETHOD_END }; static driver_t ichwd_driver = { diff --git a/sys/dev/misc/joy/joy.c b/sys/dev/misc/joy/joy.c index ff98c6d132..faf9603d4a 100644 --- a/sys/dev/misc/joy/joy.c +++ b/sys/dev/misc/joy/joy.c @@ -137,7 +137,7 @@ joy_attach (device_t dev) static device_method_t joy_methods[] = { DEVMETHOD(device_probe, joy_probe), DEVMETHOD(device_attach, joy_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t joy_isa_driver = { diff --git a/sys/dev/misc/lpbb/lpbb.c b/sys/dev/misc/lpbb/lpbb.c index e2af9bd3a4..3d2b9ccbae 100644 --- a/sys/dev/misc/lpbb/lpbb.c +++ b/sys/dev/misc/lpbb/lpbb.c @@ -216,7 +216,7 @@ static device_method_t lpbb_methods[] = { DEVMETHOD(iicbb_getscl, lpbb_getscl), DEVMETHOD(iicbb_reset, lpbb_reset), - { 0, 0 } + DEVMETHOD_END }; static driver_t lpbb_driver = { diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c index 4cba5df663..e969ed2b4e 100644 --- a/sys/dev/misc/lpt/lpt.c +++ b/sys/dev/misc/lpt/lpt.c @@ -966,7 +966,7 @@ static device_method_t lpt_methods[] = { DEVMETHOD(device_probe, lpt_probe), DEVMETHOD(device_attach, lpt_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t lpt_driver = { diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c index edff3adfda..a49e5932fb 100644 --- a/sys/dev/misc/musycc/musycc.c +++ b/sys/dev/misc/musycc/musycc.c @@ -1552,7 +1552,7 @@ static device_method_t musycc_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t musycc_driver = { diff --git a/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c b/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c index 0f6fa73b94..980730f496 100644 --- a/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c +++ b/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c @@ -212,7 +212,7 @@ int nsclpcsio_isa_attach(struct device *); static device_method_t nsclpcsio_isa_methods[] = { DEVMETHOD(device_probe, nsclpcsio_isa_probe), DEVMETHOD(device_attach, nsclpcsio_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t nsclpcsio_isa_driver = { diff --git a/sys/dev/misc/orm/orm.c b/sys/dev/misc/orm/orm.c index 3edb44284a..12e07ee19c 100644 --- a/sys/dev/misc/orm/orm.c +++ b/sys/dev/misc/orm/orm.c @@ -182,7 +182,7 @@ static device_method_t orm_methods[] = { DEVMETHOD(device_probe, orm_probe), DEVMETHOD(device_attach, orm_attach), DEVMETHOD(device_detach, orm_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t orm_driver = { diff --git a/sys/dev/misc/pcfclock/pcfclock.c b/sys/dev/misc/pcfclock/pcfclock.c index a1acc9318b..5d7d28f211 100644 --- a/sys/dev/misc/pcfclock/pcfclock.c +++ b/sys/dev/misc/pcfclock/pcfclock.c @@ -322,7 +322,7 @@ static device_method_t pcfclock_methods[] = { DEVMETHOD(device_probe, pcfclock_probe), DEVMETHOD(device_attach, pcfclock_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t pcfclock_driver = { diff --git a/sys/dev/misc/ppc/ppc.c b/sys/dev/misc/ppc/ppc.c index 0ac5fc09de..bc831b197b 100644 --- a/sys/dev/misc/ppc/ppc.c +++ b/sys/dev/misc/ppc/ppc.c @@ -99,7 +99,7 @@ static device_method_t ppc_methods[] = { DEVMETHOD(ppbus_read, ppc_read), DEVMETHOD(ppbus_write, ppc_write), - { 0, 0 } + DEVMETHOD_END }; static driver_t ppc_driver = { diff --git a/sys/dev/misc/ppi/ppi.c b/sys/dev/misc/ppi/ppi.c index 87283e5bd2..6c0c5cd31e 100644 --- a/sys/dev/misc/ppi/ppi.c +++ b/sys/dev/misc/ppi/ppi.c @@ -565,7 +565,7 @@ static device_method_t ppi_methods[] = { DEVMETHOD(device_probe, ppi_probe), DEVMETHOD(device_attach, ppi_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ppi_driver = { diff --git a/sys/dev/misc/pps/pps.c b/sys/dev/misc/pps/pps.c index 7233b3f3f4..065a425ede 100644 --- a/sys/dev/misc/pps/pps.c +++ b/sys/dev/misc/pps/pps.c @@ -193,7 +193,7 @@ static device_method_t pps_methods[] = { DEVMETHOD(device_probe, ppsprobe), DEVMETHOD(device_attach, ppsattach), - { 0, 0 } + DEVMETHOD_END }; static driver_t pps_driver = { diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index bc85b8673a..90d3a3e3f1 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -479,7 +479,7 @@ static device_method_t psm_methods[] = { DEVMETHOD(device_detach, psmdetach), DEVMETHOD(device_resume, psmresume), - { 0, 0 } + DEVMETHOD_END }; static driver_t psm_driver = { @@ -4601,7 +4601,7 @@ 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/misc/puc/puc.c b/sys/dev/misc/puc/puc.c index b7d98c9535..7fd222f9e1 100644 --- a/sys/dev/misc/puc/puc.c +++ b/sys/dev/misc/puc/puc.c @@ -748,7 +748,7 @@ static device_method_t puc_pci_methods[] = { DEVMETHOD(bus_teardown_intr, puc_teardown_intr), DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t puc_pci_driver = { diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c index 5c9488ec29..142e563390 100644 --- a/sys/dev/misc/spic/spic.c +++ b/sys/dev/misc/spic/spic.c @@ -571,7 +571,7 @@ static device_method_t spic_methods[] = { DEVMETHOD(device_probe, spic_probe), DEVMETHOD(device_attach, spic_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t spic_driver = { diff --git a/sys/dev/netif/acx/if_acx.c b/sys/dev/netif/acx/if_acx.c index f4ec703d47..e577dcc55d 100644 --- a/sys/dev/netif/acx/if_acx.c +++ b/sys/dev/netif/acx/if_acx.c @@ -209,7 +209,7 @@ static device_method_t acx_methods[] = { DEVMETHOD(device_suspend, acx_suspend), DEVMETHOD(device_resume, acx_resume), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t acx_driver = { diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c index 5675b680d0..ca2ed34b2d 100644 --- a/sys/dev/netif/an/if_an_isa.c +++ b/sys/dev/netif/an/if_an_isa.c @@ -141,7 +141,7 @@ static device_method_t an_isa_methods[] = { DEVMETHOD(device_attach, an_attach_isa), DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t an_isa_driver = { diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c index 9ece83905b..c78f7409b8 100644 --- a/sys/dev/netif/an/if_an_pccard.c +++ b/sys/dev/netif/an/if_an_pccard.c @@ -89,7 +89,7 @@ static device_method_t an_pccard_methods[] = { DEVMETHOD(card_compat_probe, an_pccard_probe), DEVMETHOD(card_compat_attach, an_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t an_pccard_driver = { diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c index af637b2818..004c47f02b 100644 --- a/sys/dev/netif/an/if_an_pci.c +++ b/sys/dev/netif/an/if_an_pci.c @@ -246,7 +246,7 @@ static device_method_t an_pci_methods[] = { DEVMETHOD(device_shutdown, an_shutdown), DEVMETHOD(device_suspend, an_suspend_pci), DEVMETHOD(device_resume, an_resume_pci), - { 0, 0 } + DEVMETHOD_END }; static driver_t an_pci_driver = { diff --git a/sys/dev/netif/ar/if_ar_isa.c b/sys/dev/netif/ar/if_ar_isa.c index 24e68f51ab..0f007024f0 100644 --- a/sys/dev/netif/ar/if_ar_isa.c +++ b/sys/dev/netif/ar/if_ar_isa.c @@ -76,7 +76,7 @@ static device_method_t ar_methods[] = { DEVMETHOD(device_probe, ar_isa_probe), DEVMETHOD(device_attach, ar_isa_attach), DEVMETHOD(device_detach, ar_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ar_isa_driver = { diff --git a/sys/dev/netif/ar/if_ar_pci.c b/sys/dev/netif/ar/if_ar_pci.c index 12ec94eed4..6ac3cf0d05 100644 --- a/sys/dev/netif/ar/if_ar_pci.c +++ b/sys/dev/netif/ar/if_ar_pci.c @@ -81,7 +81,7 @@ static device_method_t ar_pci_methods[] = { DEVMETHOD(device_probe, ar_pci_probe), DEVMETHOD(device_attach, ar_pci_attach), DEVMETHOD(device_detach, ar_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ar_pci_driver = { diff --git a/sys/dev/netif/ath/ath/if_ath_pci.c b/sys/dev/netif/ath/ath/if_ath_pci.c index e168c57175..7956e178e7 100644 --- a/sys/dev/netif/ath/ath/if_ath_pci.c +++ b/sys/dev/netif/ath/ath/if_ath_pci.c @@ -247,7 +247,7 @@ static device_method_t ath_pci_methods[] = { DEVMETHOD(device_suspend, ath_pci_suspend), DEVMETHOD(device_resume, ath_pci_resume), - { 0,0 } + DEVMETHOD_END }; static driver_t ath_pci_driver = { "ath", diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c index 57e9b70c1c..26cff5ff4b 100644 --- a/sys/dev/netif/aue/if_aue.c +++ b/sys/dev/netif/aue/if_aue.c @@ -219,7 +219,7 @@ static device_method_t aue_methods[] = { DEVMETHOD(miibus_writereg, aue_miibus_writereg), DEVMETHOD(miibus_statchg, aue_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t aue_driver = { diff --git a/sys/dev/netif/axe/if_axe.c b/sys/dev/netif/axe/if_axe.c index 39be2b0715..dc84464708 100644 --- a/sys/dev/netif/axe/if_axe.c +++ b/sys/dev/netif/axe/if_axe.c @@ -155,7 +155,7 @@ static device_method_t axe_methods[] = { DEVMETHOD(miibus_writereg, axe_miibus_writereg), DEVMETHOD(miibus_statchg, axe_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t axe_driver = { diff --git a/sys/dev/netif/bce/if_bce.c b/sys/dev/netif/bce/if_bce.c index 3673db8a81..a7c109d025 100644 --- a/sys/dev/netif/bce/if_bce.c +++ b/sys/dev/netif/bce/if_bce.c @@ -476,7 +476,7 @@ static device_method_t bce_methods[] = { DEVMETHOD(miibus_writereg, bce_miibus_write_reg), DEVMETHOD(miibus_statchg, bce_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t bce_driver = { diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c index 34317f4d7b..2b41283346 100644 --- a/sys/dev/netif/bfe/if_bfe.c +++ b/sys/dev/netif/bfe/if_bfe.c @@ -144,7 +144,7 @@ static device_method_t bfe_methods[] = { DEVMETHOD(miibus_readreg, bfe_miibus_readreg), DEVMETHOD(miibus_writereg, bfe_miibus_writereg), - { 0, 0 } + DEVMETHOD_END }; static driver_t bfe_driver = { diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c index c89b602c13..c7afa823d9 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -443,7 +443,7 @@ static device_method_t bge_methods[] = { DEVMETHOD(miibus_writereg, bge_miibus_writereg), DEVMETHOD(miibus_statchg, bge_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(bge, bge_driver, bge_methods, sizeof(struct bge_softc)); diff --git a/sys/dev/netif/bnx/if_bnx.c b/sys/dev/netif/bnx/if_bnx.c index dca4428e11..4768f44fb2 100644 --- a/sys/dev/netif/bnx/if_bnx.c +++ b/sys/dev/netif/bnx/if_bnx.c @@ -255,7 +255,7 @@ static device_method_t bnx_methods[] = { DEVMETHOD(miibus_writereg, bnx_miibus_writereg), DEVMETHOD(miibus_statchg, bnx_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(bnx, bnx_driver, bnx_methods, sizeof(struct bnx_softc)); diff --git a/sys/dev/netif/bwi/if_bwi.c b/sys/dev/netif/bwi/if_bwi.c index 5a6b7b36d4..8e0aca91a6 100644 --- a/sys/dev/netif/bwi/if_bwi.c +++ b/sys/dev/netif/bwi/if_bwi.c @@ -231,7 +231,7 @@ static device_method_t bwi_methods[] = { DEVMETHOD(device_suspend, bwi_suspend), DEVMETHOD(device_resume, bwi_resume), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t bwi_driver = { diff --git a/sys/dev/netif/cs/if_cs_isa.c b/sys/dev/netif/cs/if_cs_isa.c index 804d583636..08538e7b6e 100644 --- a/sys/dev/netif/cs/if_cs_isa.c +++ b/sys/dev/netif/cs/if_cs_isa.c @@ -78,7 +78,7 @@ static device_method_t cs_isa_methods[] = { DEVMETHOD(device_attach, cs_attach), DEVMETHOD(device_detach, cs_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cs_isa_driver = { diff --git a/sys/dev/netif/cs/if_cs_pccard.c b/sys/dev/netif/cs/if_cs_pccard.c index 1c48ce93b0..febde19665 100644 --- a/sys/dev/netif/cs/if_cs_pccard.c +++ b/sys/dev/netif/cs/if_cs_pccard.c @@ -81,7 +81,7 @@ static device_method_t cs_pccard_methods[] = { DEVMETHOD(card_compat_probe, cs_pccard_probe), DEVMETHOD(card_compat_attach, cs_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t cs_pccard_driver = { diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c index 8e9475f38b..dca44ae878 100644 --- a/sys/dev/netif/cue/if_cue.c +++ b/sys/dev/netif/cue/if_cue.c @@ -121,7 +121,7 @@ static device_method_t cue_methods[] = { DEVMETHOD(device_detach, cue_detach), DEVMETHOD(device_shutdown, cue_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t cue_driver = { diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index 231e8d190b..313d8de5fb 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -303,7 +303,7 @@ static device_method_t dc_methods[] = { DEVMETHOD(miibus_statchg, dc_miibus_statchg), DEVMETHOD(miibus_mediainit, dc_miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; static driver_t dc_driver = { diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 0b571f0da3..4d989b5bf7 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -4150,7 +4150,7 @@ static device_method_t tulip_pci_methods[] = { DEVMETHOD(device_probe, tulip_pci_probe), DEVMETHOD(device_attach, tulip_pci_attach), DEVMETHOD(device_shutdown, tulip_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t tulip_pci_driver = { "de", diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c index e8b7687b6f..4ae2bf2c70 100644 --- a/sys/dev/netif/ed/if_ed_isa.c +++ b/sys/dev/netif/ed/if_ed_isa.c @@ -180,7 +180,7 @@ static device_method_t ed_isa_methods[] = { DEVMETHOD(device_attach, ed_isa_attach), DEVMETHOD(device_attach, ed_isa_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ed_isa_driver = { diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c index 6ac9611d61..a807b903e8 100644 --- a/sys/dev/netif/ed/if_ed_pccard.c +++ b/sys/dev/netif/ed/if_ed_pccard.c @@ -525,7 +525,7 @@ static device_method_t ed_pccard_methods[] = { DEVMETHOD(card_compat_match, ed_pccard_match), DEVMETHOD(card_compat_probe, ed_pccard_probe), DEVMETHOD(card_compat_attach, ed_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ed_pccard_driver = { diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c index fbc0b800f0..099b7bf876 100644 --- a/sys/dev/netif/ed/if_ed_pci.c +++ b/sys/dev/netif/ed/if_ed_pci.c @@ -152,7 +152,7 @@ static device_method_t ed_pci_methods[] = { DEVMETHOD(device_attach, ed_pci_attach), DEVMETHOD(device_attach, ed_pci_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ed_pci_driver = { diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c index 7cfc01d2a7..41b7c60164 100644 --- a/sys/dev/netif/em/if_em.c +++ b/sys/dev/netif/em/if_em.c @@ -354,7 +354,7 @@ static device_method_t em_methods[] = { DEVMETHOD(device_shutdown, em_shutdown), DEVMETHOD(device_suspend, em_suspend), DEVMETHOD(device_resume, em_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t em_driver = { diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c index 5d52e0cff4..c1c1e2179e 100644 --- a/sys/dev/netif/emx/if_emx.c +++ b/sys/dev/netif/emx/if_emx.c @@ -271,7 +271,7 @@ static device_method_t emx_methods[] = { DEVMETHOD(device_shutdown, emx_shutdown), DEVMETHOD(device_suspend, emx_suspend), DEVMETHOD(device_resume, emx_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t emx_driver = { diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c index b17549f129..6068b9f0e5 100644 --- a/sys/dev/netif/ep/if_ep_isa.c +++ b/sys/dev/netif/ep/if_ep_isa.c @@ -345,7 +345,7 @@ static device_method_t ep_isa_methods[] = { DEVMETHOD(device_probe, ep_isa_probe), DEVMETHOD(device_attach, ep_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ep_isa_driver = { diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c index a20d90edda..4b8a3eeaf3 100644 --- a/sys/dev/netif/ep/if_ep_pccard.c +++ b/sys/dev/netif/ep/if_ep_pccard.c @@ -286,7 +286,7 @@ static device_method_t ep_pccard_methods[] = { DEVMETHOD(card_compat_probe, ep_pccard_probe), DEVMETHOD(card_compat_attach, ep_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ep_pccard_driver = { diff --git a/sys/dev/netif/et/if_et.c b/sys/dev/netif/et/if_et.c index 119d62ca7f..9dd9bcb7ee 100644 --- a/sys/dev/netif/et/if_et.c +++ b/sys/dev/netif/et/if_et.c @@ -162,7 +162,7 @@ static device_method_t et_methods[] = { DEVMETHOD(miibus_writereg, et_miibus_writereg), DEVMETHOD(miibus_statchg, et_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t et_driver = { diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c index e8e8d35961..41fa841949 100644 --- a/sys/dev/netif/ex/if_ex_isa.c +++ b/sys/dev/netif/ex/if_ex_isa.c @@ -64,7 +64,7 @@ static device_method_t ex_methods[] = { DEVMETHOD(device_probe, ex_isa_probe), DEVMETHOD(device_attach, ex_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ex_driver = { diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c index 902510f086..68ba9d6fe8 100644 --- a/sys/dev/netif/ex/if_ex_pccard.c +++ b/sys/dev/netif/ex/if_ex_pccard.c @@ -69,7 +69,7 @@ static device_method_t ex_pccard_methods[] = { DEVMETHOD(card_compat_probe, ex_pccard_probe), DEVMETHOD(card_compat_attach, ex_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ex_pccard_driver = { diff --git a/sys/dev/netif/fe/if_fe_isa.c b/sys/dev/netif/fe/if_fe_isa.c index e2c9774554..5a9b5501d3 100644 --- a/sys/dev/netif/fe/if_fe_isa.c +++ b/sys/dev/netif/fe/if_fe_isa.c @@ -61,7 +61,7 @@ static device_method_t fe_isa_methods[] = { DEVMETHOD(device_probe, fe_isa_probe), DEVMETHOD(device_attach, fe_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t fe_isa_driver = { diff --git a/sys/dev/netif/fe/if_fe_pccard.c b/sys/dev/netif/fe/if_fe_pccard.c index 44be02ecc4..05df49534c 100644 --- a/sys/dev/netif/fe/if_fe_pccard.c +++ b/sys/dev/netif/fe/if_fe_pccard.c @@ -101,7 +101,7 @@ static device_method_t fe_pccard_methods[] = { DEVMETHOD(card_compat_probe, fe_pccard_probe), DEVMETHOD(card_compat_attach, fe_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t fe_pccard_driver = { diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c index d2c15c0635..927a5a84ad 100644 --- a/sys/dev/netif/fwe/if_fwe.c +++ b/sys/dev/netif/fwe/if_fwe.c @@ -606,7 +606,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/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c index b6a7450656..97bb0fd789 100644 --- a/sys/dev/netif/fxp/if_fxp.c +++ b/sys/dev/netif/fxp/if_fxp.c @@ -260,7 +260,7 @@ static device_method_t fxp_methods[] = { DEVMETHOD(miibus_readreg, fxp_miibus_readreg), DEVMETHOD(miibus_writereg, fxp_miibus_writereg), - { 0, 0 } + DEVMETHOD_END }; static driver_t fxp_driver = { diff --git a/sys/dev/netif/ic/if_ic.c b/sys/dev/netif/ic/if_ic.c index 84dfd71b85..2f4b02bb9d 100644 --- a/sys/dev/netif/ic/if_ic.c +++ b/sys/dev/netif/ic/if_ic.c @@ -108,7 +108,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/netif/igb/if_igb.c b/sys/dev/netif/igb/if_igb.c index af19a9578f..9f7ffdd2cf 100644 --- a/sys/dev/netif/igb/if_igb.c +++ b/sys/dev/netif/igb/if_igb.c @@ -251,7 +251,7 @@ static device_method_t igb_methods[] = { DEVMETHOD(device_shutdown, igb_shutdown), DEVMETHOD(device_suspend, igb_suspend), DEVMETHOD(device_resume, igb_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t igb_driver = { diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c index 53157c5902..ca5aa796a3 100644 --- a/sys/dev/netif/iwi/if_iwi.c +++ b/sys/dev/netif/iwi/if_iwi.c @@ -218,7 +218,7 @@ static device_method_t iwi_methods[] = { DEVMETHOD(device_suspend, iwi_suspend), DEVMETHOD(device_resume, iwi_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t iwi_driver = { diff --git a/sys/dev/netif/iwl/if_iwl.c b/sys/dev/netif/iwl/if_iwl.c index eb8ee8217e..8e0882a7dc 100644 --- a/sys/dev/netif/iwl/if_iwl.c +++ b/sys/dev/netif/iwl/if_iwl.c @@ -114,7 +114,7 @@ static device_method_t iwl_methods[] = { DEVMETHOD(device_detach, iwl_detach), DEVMETHOD(device_shutdown, iwl_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t iwl_driver = { diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c index 561c543807..2f70db4781 100644 --- a/sys/dev/netif/iwn/if_iwn.c +++ b/sys/dev/netif/iwn/if_iwn.c @@ -6535,7 +6535,7 @@ static device_method_t iwn_methods[] = { DEVMETHOD(device_shutdown, iwn_pci_shutdown), DEVMETHOD(device_suspend, iwn_pci_suspend), DEVMETHOD(device_resume, iwn_pci_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t iwn_driver = { diff --git a/sys/dev/netif/ixgbe/ixgbe.c b/sys/dev/netif/ixgbe/ixgbe.c index 1c2aaebf58..3352f81c20 100644 --- a/sys/dev/netif/ixgbe/ixgbe.c +++ b/sys/dev/netif/ixgbe/ixgbe.c @@ -213,7 +213,7 @@ static device_method_t ixgbe_methods[] = { DEVMETHOD(device_attach, ixgbe_attach), DEVMETHOD(device_detach, ixgbe_detach), DEVMETHOD(device_shutdown, ixgbe_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t ixgbe_driver = { diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c index 1fc0346fc4..5e532c9055 100644 --- a/sys/dev/netif/kue/if_kue.c +++ b/sys/dev/netif/kue/if_kue.c @@ -152,7 +152,7 @@ static device_method_t kue_methods[] = { DEVMETHOD(device_detach, kue_detach), DEVMETHOD(device_shutdown, kue_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t kue_driver = { diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c index 35e783f4f9..91e79084ac 100644 --- a/sys/dev/netif/lge/if_lge.c +++ b/sys/dev/netif/lge/if_lge.c @@ -186,7 +186,7 @@ static device_method_t lge_methods[] = { DEVMETHOD(miibus_writereg, lge_miibus_writereg), DEVMETHOD(miibus_statchg, lge_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(lge, lge_driver, lge_methods, sizeof(struct lge_softc)); diff --git a/sys/dev/netif/lgue/if_lgue.c b/sys/dev/netif/lgue/if_lgue.c index ce4c98926b..52f3bf4b6b 100644 --- a/sys/dev/netif/lgue/if_lgue.c +++ b/sys/dev/netif/lgue/if_lgue.c @@ -78,7 +78,7 @@ static device_method_t lgue_methods[] = { DEVMETHOD(device_attach, lgue_attach), DEVMETHOD(device_detach, lgue_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t lgue_driver = { diff --git a/sys/dev/netif/lnc/if_lnc_isa.c b/sys/dev/netif/lnc/if_lnc_isa.c index a3f99c1372..495e627f7d 100644 --- a/sys/dev/netif/lnc/if_lnc_isa.c +++ b/sys/dev/netif/lnc/if_lnc_isa.c @@ -139,7 +139,7 @@ static device_method_t le_isa_methods[] = { DEVMETHOD(device_suspend, le_isa_suspend), DEVMETHOD(device_resume, le_isa_resume), - { 0, 0 } + DEVMETHOD_END }; DEFINE_CLASS_0(lnc, le_isa_driver, le_isa_methods, sizeof(struct le_isa_softc)); diff --git a/sys/dev/netif/lnc/if_lnc_pci.c b/sys/dev/netif/lnc/if_lnc_pci.c index 9b3cc68187..28dddaa75d 100644 --- a/sys/dev/netif/lnc/if_lnc_pci.c +++ b/sys/dev/netif/lnc/if_lnc_pci.c @@ -141,7 +141,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(lnc, le_pci_driver, le_pci_methods, sizeof(struct le_pci_softc)); diff --git a/sys/dev/netif/mii_layer/acphy.c b/sys/dev/netif/mii_layer/acphy.c index ab53f053a6..1da8adee09 100644 --- a/sys/dev/netif/mii_layer/acphy.c +++ b/sys/dev/netif/mii_layer/acphy.c @@ -100,7 +100,7 @@ static device_method_t acphy_methods[] = { DEVMETHOD(device_attach, acphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc acphys[] = { diff --git a/sys/dev/netif/mii_layer/amphy.c b/sys/dev/netif/mii_layer/amphy.c index 088191ecb9..b75039160d 100644 --- a/sys/dev/netif/mii_layer/amphy.c +++ b/sys/dev/netif/mii_layer/amphy.c @@ -66,7 +66,7 @@ static device_method_t amphy_methods[] = { DEVMETHOD(device_attach, amphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc amphys[] = { diff --git a/sys/dev/netif/mii_layer/atphy.c b/sys/dev/netif/mii_layer/atphy.c index fea8da45d9..0987d3157d 100644 --- a/sys/dev/netif/mii_layer/atphy.c +++ b/sys/dev/netif/mii_layer/atphy.c @@ -59,7 +59,7 @@ static device_method_t atphy_methods[] = { DEVMETHOD(device_attach, atphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc atphys[] = { diff --git a/sys/dev/netif/mii_layer/brgphy.c b/sys/dev/netif/mii_layer/brgphy.c index 3e6ed14add..5358553aa0 100644 --- a/sys/dev/netif/mii_layer/brgphy.c +++ b/sys/dev/netif/mii_layer/brgphy.c @@ -116,7 +116,7 @@ static device_method_t brgphy_methods[] = { DEVMETHOD(device_attach, brgphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t brgphy_devclass; diff --git a/sys/dev/netif/mii_layer/ciphy.c b/sys/dev/netif/mii_layer/ciphy.c index e6232356f2..2b48d02f4d 100644 --- a/sys/dev/netif/mii_layer/ciphy.c +++ b/sys/dev/netif/mii_layer/ciphy.c @@ -66,7 +66,7 @@ static device_method_t ciphy_methods[] = { DEVMETHOD(device_attach, ciphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc ciphys[] = { diff --git a/sys/dev/netif/mii_layer/dcphy.c b/sys/dev/netif/mii_layer/dcphy.c index 290deab967..5540426cf9 100644 --- a/sys/dev/netif/mii_layer/dcphy.c +++ b/sys/dev/netif/mii_layer/dcphy.c @@ -89,7 +89,7 @@ static device_method_t dcphy_methods[] = { DEVMETHOD(device_attach, dcphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t dcphy_devclass; diff --git a/sys/dev/netif/mii_layer/e1000phy.c b/sys/dev/netif/mii_layer/e1000phy.c index 6b14045145..b85823952b 100644 --- a/sys/dev/netif/mii_layer/e1000phy.c +++ b/sys/dev/netif/mii_layer/e1000phy.c @@ -72,7 +72,7 @@ static device_method_t e1000phy_methods[] = { DEVMETHOD(device_attach, e1000phy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc e1000phys[] = { diff --git a/sys/dev/netif/mii_layer/exphy.c b/sys/dev/netif/mii_layer/exphy.c index b66c0be728..978cdb5375 100644 --- a/sys/dev/netif/mii_layer/exphy.c +++ b/sys/dev/netif/mii_layer/exphy.c @@ -97,7 +97,7 @@ static device_method_t exphy_methods[] = { DEVMETHOD(device_attach, exphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t exphy_devclass; diff --git a/sys/dev/netif/mii_layer/inphy.c b/sys/dev/netif/mii_layer/inphy.c index 214026ece4..27867da6d9 100644 --- a/sys/dev/netif/mii_layer/inphy.c +++ b/sys/dev/netif/mii_layer/inphy.c @@ -61,7 +61,7 @@ static device_method_t inphy_methods[] = { DEVMETHOD(device_attach, inphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc inphys[] = { diff --git a/sys/dev/netif/mii_layer/ip1000phy.c b/sys/dev/netif/mii_layer/ip1000phy.c index ed99d05e89..aa5866a85c 100644 --- a/sys/dev/netif/mii_layer/ip1000phy.c +++ b/sys/dev/netif/mii_layer/ip1000phy.c @@ -67,7 +67,7 @@ static device_method_t ip1000phy_methods[] = { DEVMETHOD(device_attach, ip1000phy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t ip1000phy_devclass; diff --git a/sys/dev/netif/mii_layer/lxtphy.c b/sys/dev/netif/mii_layer/lxtphy.c index 4cf762e667..7ce1931245 100644 --- a/sys/dev/netif/mii_layer/lxtphy.c +++ b/sys/dev/netif/mii_layer/lxtphy.c @@ -108,7 +108,7 @@ static device_method_t lxtphy_methods[] = { DEVMETHOD(device_attach, lxtphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc lxtphys[] = { diff --git a/sys/dev/netif/mii_layer/mii.c b/sys/dev/netif/mii_layer/mii.c index 5410c45773..29221095fe 100644 --- a/sys/dev/netif/mii_layer/mii.c +++ b/sys/dev/netif/mii_layer/mii.c @@ -37,7 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/mii.c,v 1.6.2.2 2002/08/19 16:56:33 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/mii.c,v 1.12 2008/07/22 10:59:16 sephe Exp $ */ /* @@ -87,7 +86,7 @@ static device_method_t miibus_methods[] = { DEVMETHOD(miibus_statchg, miibus_statchg), DEVMETHOD(miibus_mediainit, miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; devclass_t miibus_devclass; diff --git a/sys/dev/netif/mii_layer/mlphy.c b/sys/dev/netif/mii_layer/mlphy.c index 0ad3c86a78..ba9d7c9656 100644 --- a/sys/dev/netif/mii_layer/mlphy.c +++ b/sys/dev/netif/mii_layer/mlphy.c @@ -84,7 +84,7 @@ static device_method_t mlphy_methods[] = { DEVMETHOD(device_attach, mlphy_attach), DEVMETHOD(device_detach, mlphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t mlphy_devclass; diff --git a/sys/dev/netif/mii_layer/nsgphy.c b/sys/dev/netif/mii_layer/nsgphy.c index a8a4403c8c..017f5bf667 100644 --- a/sys/dev/netif/mii_layer/nsgphy.c +++ b/sys/dev/netif/mii_layer/nsgphy.c @@ -74,7 +74,7 @@ static device_method_t nsgphy_methods[] = { DEVMETHOD(device_probe, nsgphy_probe), DEVMETHOD(device_attach, nsgphy_attach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc nsgphys[] = { diff --git a/sys/dev/netif/mii_layer/nsphy.c b/sys/dev/netif/mii_layer/nsphy.c index 9f09569d8c..2d7a8b2e18 100644 --- a/sys/dev/netif/mii_layer/nsphy.c +++ b/sys/dev/netif/mii_layer/nsphy.c @@ -101,7 +101,7 @@ static device_method_t nsphy_methods[] = { DEVMETHOD(device_attach, nsphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc nsphys[] = { diff --git a/sys/dev/netif/mii_layer/pnaphy.c b/sys/dev/netif/mii_layer/pnaphy.c index e33342db62..2a429dbd8f 100644 --- a/sys/dev/netif/mii_layer/pnaphy.c +++ b/sys/dev/netif/mii_layer/pnaphy.c @@ -70,7 +70,7 @@ static device_method_t pnaphy_methods[] = { DEVMETHOD(device_attach, pnaphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc pnaphys[] = { diff --git a/sys/dev/netif/mii_layer/pnphy.c b/sys/dev/netif/mii_layer/pnphy.c index d5a86487be..c1f093bbfe 100644 --- a/sys/dev/netif/mii_layer/pnphy.c +++ b/sys/dev/netif/mii_layer/pnphy.c @@ -79,7 +79,7 @@ static device_method_t pnphy_methods[] = { DEVMETHOD(device_attach, pnphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pnphy_devclass; diff --git a/sys/dev/netif/mii_layer/qsphy.c b/sys/dev/netif/mii_layer/qsphy.c index 878714f7ae..007f93a948 100644 --- a/sys/dev/netif/mii_layer/qsphy.c +++ b/sys/dev/netif/mii_layer/qsphy.c @@ -102,7 +102,7 @@ static device_method_t qsphy_methods[] = { DEVMETHOD(device_attach, qsphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc qsphys[] = { diff --git a/sys/dev/netif/mii_layer/rgephy.c b/sys/dev/netif/mii_layer/rgephy.c index d48f0505d1..f2dc2ef63f 100644 --- a/sys/dev/netif/mii_layer/rgephy.c +++ b/sys/dev/netif/mii_layer/rgephy.c @@ -69,7 +69,7 @@ static device_method_t rgephy_methods[] = { DEVMETHOD(device_attach, rgephy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc rgephys[] = { diff --git a/sys/dev/netif/mii_layer/rlphy.c b/sys/dev/netif/mii_layer/rlphy.c index df088a99ec..0a8fde84af 100644 --- a/sys/dev/netif/mii_layer/rlphy.c +++ b/sys/dev/netif/mii_layer/rlphy.c @@ -68,7 +68,7 @@ static device_method_t rlphy_methods[] = { DEVMETHOD(device_attach, rlphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc rlphys[] = { diff --git a/sys/dev/netif/mii_layer/ruephy.c b/sys/dev/netif/mii_layer/ruephy.c index 7ef0a800a2..b27bc9d2cc 100644 --- a/sys/dev/netif/mii_layer/ruephy.c +++ b/sys/dev/netif/mii_layer/ruephy.c @@ -55,7 +55,7 @@ static device_method_t ruephy_methods[] = { DEVMETHOD(device_attach, ruephy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t ruephy_devclass; diff --git a/sys/dev/netif/mii_layer/tlphy.c b/sys/dev/netif/mii_layer/tlphy.c index 57dfe9ba5b..17c4e60190 100644 --- a/sys/dev/netif/mii_layer/tlphy.c +++ b/sys/dev/netif/mii_layer/tlphy.c @@ -108,7 +108,7 @@ static device_method_t tlphy_methods[] = { DEVMETHOD(device_attach, tlphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc tlphys[] = { diff --git a/sys/dev/netif/mii_layer/truephy.c b/sys/dev/netif/mii_layer/truephy.c index bbc912c16c..b798e6023f 100644 --- a/sys/dev/netif/mii_layer/truephy.c +++ b/sys/dev/netif/mii_layer/truephy.c @@ -63,7 +63,7 @@ static device_method_t truephy_methods[] = { DEVMETHOD(device_attach, truephy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc truephys[] = { diff --git a/sys/dev/netif/mii_layer/ukphy.c b/sys/dev/netif/mii_layer/ukphy.c index f7b5949405..5b795ebd21 100644 --- a/sys/dev/netif/mii_layer/ukphy.c +++ b/sys/dev/netif/mii_layer/ukphy.c @@ -99,7 +99,7 @@ static device_method_t ukphy_methods[] = { DEVMETHOD(device_attach, ukphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static devclass_t ukphy_devclass; diff --git a/sys/dev/netif/mii_layer/xmphy.c b/sys/dev/netif/mii_layer/xmphy.c index 88f602f7ab..5dc3b7771b 100644 --- a/sys/dev/netif/mii_layer/xmphy.c +++ b/sys/dev/netif/mii_layer/xmphy.c @@ -66,7 +66,7 @@ static device_method_t xmphy_methods[] = { DEVMETHOD(device_attach, xmphy_attach), DEVMETHOD(device_detach, ukphy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - { 0, 0 } + DEVMETHOD_END }; static const struct mii_phydesc xmphys[] = { diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c index 7c3c0daf32..8fa1def2ea 100644 --- a/sys/dev/netif/mn/if_mn.c +++ b/sys/dev/netif/mn/if_mn.c @@ -1427,7 +1427,7 @@ static device_method_t mn_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t mn_driver = { diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index 50b2db9971..a94a3fccbc 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -121,7 +121,7 @@ static device_method_t mxge_methods[] = DEVMETHOD(device_attach, mxge_attach), DEVMETHOD(device_detach, mxge_detach), DEVMETHOD(device_shutdown, mxge_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t mxge_driver = diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c index 6047cb496a..99b427a039 100644 --- a/sys/dev/netif/my/if_my.c +++ b/sys/dev/netif/my/if_my.c @@ -145,7 +145,7 @@ static device_method_t my_methods[] = { DEVMETHOD(device_detach, my_detach), DEVMETHOD(device_shutdown, my_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t my_driver = { diff --git a/sys/dev/netif/ndis/if_ndis_pccard.c b/sys/dev/netif/ndis/if_ndis_pccard.c index a7ca780438..f2c9e5fd33 100644 --- a/sys/dev/netif/ndis/if_ndis_pccard.c +++ b/sys/dev/netif/ndis/if_ndis_pccard.c @@ -107,7 +107,7 @@ static device_method_t ndis_methods[] = { DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), - { 0, 0 } + DEVMETHOD_END }; static driver_t ndis_driver = { diff --git a/sys/dev/netif/ndis/if_ndis_pci.c b/sys/dev/netif/ndis/if_ndis_pci.c index e6c6d04caa..7f243f95e8 100644 --- a/sys/dev/netif/ndis/if_ndis_pci.c +++ b/sys/dev/netif/ndis/if_ndis_pci.c @@ -97,7 +97,7 @@ static device_method_t ndis_methods[] = { /* Bus interface */ DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), - { 0, 0 } + DEVMETHOD_END }; static driver_t ndis_driver = { diff --git a/sys/dev/netif/ndis/if_ndis_u4b.c b/sys/dev/netif/ndis/if_ndis_u4b.c index b9c4845ebd..b627ce4874 100644 --- a/sys/dev/netif/ndis/if_ndis_u4b.c +++ b/sys/dev/netif/ndis/if_ndis_u4b.c @@ -91,7 +91,7 @@ static device_method_t ndis_methods[] = { /* bus interface */ DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), - { 0, 0 } + DEVMETHOD_END }; static driver_t ndis_driver = { diff --git a/sys/dev/netif/ndis/if_ndis_usb.c b/sys/dev/netif/ndis/if_ndis_usb.c index ed3f4e9330..5dccea140c 100644 --- a/sys/dev/netif/ndis/if_ndis_usb.c +++ b/sys/dev/netif/ndis/if_ndis_usb.c @@ -96,7 +96,7 @@ static device_method_t ndis_methods[] = { DEVMETHOD(bus_driver_added, bus_generic_driver_added), DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), - { 0, 0 } + DEVMETHOD_END }; static driver_t ndis_driver = { diff --git a/sys/dev/netif/nfe/if_nfe.c b/sys/dev/netif/nfe/if_nfe.c index 2f9735a9fd..45a10f8a1c 100644 --- a/sys/dev/netif/nfe/if_nfe.c +++ b/sys/dev/netif/nfe/if_nfe.c @@ -343,7 +343,7 @@ static device_method_t nfe_methods[] = { DEVMETHOD(miibus_writereg, nfe_miibus_writereg), DEVMETHOD(miibus_statchg, nfe_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t nfe_driver = { diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index e26f76906c..27eab66c10 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -218,7 +218,7 @@ static device_method_t nge_methods[] = { DEVMETHOD(miibus_writereg, nge_miibus_writereg), DEVMETHOD(miibus_statchg, nge_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(nge, nge_driver, nge_methods, sizeof(struct nge_softc)); diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index 3bd01b501d..04b9fa33fb 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -170,7 +170,7 @@ static device_method_t pcn_methods[] = { DEVMETHOD(miibus_writereg, pcn_miibus_writereg), DEVMETHOD(miibus_statchg, pcn_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t pcn_driver = { diff --git a/sys/dev/netif/plip/if_plip.c b/sys/dev/netif/plip/if_plip.c index 3acb4a5fe8..52d2fe5858 100644 --- a/sys/dev/netif/plip/if_plip.c +++ b/sys/dev/netif/plip/if_plip.c @@ -747,7 +747,7 @@ static device_method_t lp_methods[] = { DEVMETHOD(device_probe, lp_probe), DEVMETHOD(device_attach, lp_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t lp_driver = { diff --git a/sys/dev/netif/ral/if_ral_pci.c b/sys/dev/netif/ral/if_ral_pci.c index e40293bcdc..8fa405da16 100644 --- a/sys/dev/netif/ral/if_ral_pci.c +++ b/sys/dev/netif/ral/if_ral_pci.c @@ -128,7 +128,7 @@ static device_method_t ral_pci_methods[] = { DEVMETHOD(device_suspend, ral_pci_suspend), DEVMETHOD(device_resume, ral_pci_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t ral_pci_driver = { diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c index d9872b2a24..ed3709f7be 100644 --- a/sys/dev/netif/re/if_re.c +++ b/sys/dev/netif/re/if_re.c @@ -374,7 +374,7 @@ static device_method_t re_methods[] = { DEVMETHOD(miibus_writereg, re_miibus_writereg), DEVMETHOD(miibus_statchg, re_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t re_driver = { diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 5e5e226207..251042cafc 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -240,7 +240,7 @@ static device_method_t rl_methods[] = { DEVMETHOD(miibus_writereg, rl_miibus_writereg), DEVMETHOD(miibus_statchg, rl_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(rl, rl_driver, rl_methods, sizeof(struct rl_softc)); diff --git a/sys/dev/netif/rtw/if_rtw_pci.c b/sys/dev/netif/rtw/if_rtw_pci.c index 27e2a89339..862e5c92a1 100644 --- a/sys/dev/netif/rtw/if_rtw_pci.c +++ b/sys/dev/netif/rtw/if_rtw_pci.c @@ -139,7 +139,7 @@ static device_method_t rtw_pci_methods[] = { DEVMETHOD(device_suspend, rtw_pci_suspend), DEVMETHOD(device_resume, rtw_pci_resume), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t rtw_pci_driver = { diff --git a/sys/dev/netif/rue/if_rue.c b/sys/dev/netif/rue/if_rue.c index f4c2752477..64413ca446 100644 --- a/sys/dev/netif/rue/if_rue.c +++ b/sys/dev/netif/rue/if_rue.c @@ -174,7 +174,7 @@ static device_method_t rue_methods[] = { DEVMETHOD(miibus_writereg, rue_miibus_writereg), DEVMETHOD(miibus_statchg, rue_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t rue_driver = { diff --git a/sys/dev/netif/rum/if_rum.c b/sys/dev/netif/rum/if_rum.c index b81aeabfc7..b8091fa7cb 100644 --- a/sys/dev/netif/rum/if_rum.c +++ b/sys/dev/netif/rum/if_rum.c @@ -228,7 +228,7 @@ static kobj_method_t rum_methods[] = { DEVMETHOD(device_probe, rum_match), DEVMETHOD(device_attach, rum_attach), DEVMETHOD(device_detach, rum_detach), - {0,0} + DEVMETHOD_END }; static driver_t rum_driver = { diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c index fa8d12989f..8f08f81d3d 100644 --- a/sys/dev/netif/sbni/if_sbni_pci.c +++ b/sys/dev/netif/sbni/if_sbni_pci.c @@ -56,7 +56,7 @@ static device_method_t sbni_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sbni_pci_probe), DEVMETHOD(device_attach, sbni_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sbni_pci_driver = { diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c index d603bd7235..55b9cbbcd8 100644 --- a/sys/dev/netif/sbsh/if_sbsh.c +++ b/sys/dev/netif/sbsh/if_sbsh.c @@ -189,7 +189,7 @@ static device_method_t sbsh_methods[] = { DEVMETHOD(device_suspend, sbsh_suspend), DEVMETHOD(device_resume, sbsh_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t sbsh_driver = { diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index 5ee350fafa..617f82f032 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -193,7 +193,7 @@ static device_method_t sf_methods[] = { DEVMETHOD(miibus_writereg, sf_miibus_writereg), DEVMETHOD(miibus_statchg, sf_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t sf_driver = { diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index 08208968a6..6011cfc7f3 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -187,7 +187,7 @@ static device_method_t sis_methods[] = { DEVMETHOD(miibus_writereg, sis_miibus_writereg), DEVMETHOD(miibus_statchg, sis_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t sis_driver = { diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index 03343f2835..b173f3bc1f 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -270,7 +270,7 @@ static device_method_t skc_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(skc, skc_driver, skc_methods, sizeof(struct sk_softc)); @@ -292,7 +292,7 @@ static device_method_t sk_methods[] = { DEVMETHOD(miibus_writereg, sk_miibus_writereg), DEVMETHOD(miibus_statchg, sk_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(sk, sk_driver, sk_methods, sizeof(struct sk_if_softc)); diff --git a/sys/dev/netif/sln/if_sln.c b/sys/dev/netif/sln/if_sln.c index a817f19dc8..a87ab01033 100644 --- a/sys/dev/netif/sln/if_sln.c +++ b/sys/dev/netif/sln/if_sln.c @@ -135,7 +135,7 @@ static device_method_t sln_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - {0, 0} + DEVMETHOD_END }; static driver_t sln_driver = { diff --git a/sys/dev/netif/sn/if_sn_isa.c b/sys/dev/netif/sn/if_sn_isa.c index c08f2b8815..8bfb9bc20b 100644 --- a/sys/dev/netif/sn/if_sn_isa.c +++ b/sys/dev/netif/sn/if_sn_isa.c @@ -71,7 +71,7 @@ static device_method_t sn_isa_methods[] = { DEVMETHOD(device_probe, sn_isa_probe), DEVMETHOD(device_attach, sn_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sn_isa_driver = { diff --git a/sys/dev/netif/sn/if_sn_pccard.c b/sys/dev/netif/sn/if_sn_pccard.c index 74e1db32e1..6a3306dffc 100644 --- a/sys/dev/netif/sn/if_sn_pccard.c +++ b/sys/dev/netif/sn/if_sn_pccard.c @@ -134,7 +134,7 @@ static device_method_t sn_pccard_methods[] = { DEVMETHOD(card_compat_probe, sn_pccard_probe), DEVMETHOD(card_compat_attach, sn_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sn_pccard_driver = { diff --git a/sys/dev/netif/sr/if_sr_pci.c b/sys/dev/netif/sr/if_sr_pci.c index 5f46516822..3e2fbe8adc 100644 --- a/sys/dev/netif/sr/if_sr_pci.c +++ b/sys/dev/netif/sr/if_sr_pci.c @@ -56,7 +56,7 @@ static device_method_t sr_pci_methods[] = { DEVMETHOD(device_probe, sr_pci_probe), DEVMETHOD(device_attach, sr_pci_attach), DEVMETHOD(device_detach, sr_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sr_pci_driver = { diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index 557858d4b5..240871644d 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -149,7 +149,7 @@ static device_method_t ste_methods[] = { DEVMETHOD(miibus_writereg, ste_miibus_writereg), DEVMETHOD(miibus_statchg, ste_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t ste_driver = { diff --git a/sys/dev/netif/stge/if_stge.c b/sys/dev/netif/stge/if_stge.c index 1e16ce6203..988804769e 100644 --- a/sys/dev/netif/stge/if_stge.c +++ b/sys/dev/netif/stge/if_stge.c @@ -198,7 +198,7 @@ static device_method_t stge_methods[] = { DEVMETHOD(miibus_writereg, stge_miibus_writereg), DEVMETHOD(miibus_statchg, stge_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index 701a41ccaa..74ac9d6723 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -215,7 +215,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 }; diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index 185aa2f3ff..ff66f22af4 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -342,7 +342,7 @@ static device_method_t tl_methods[] = { DEVMETHOD(miibus_writereg, tl_miibus_writereg), DEVMETHOD(miibus_statchg, tl_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t tl_driver = { diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c index f97a9289cc..cfc6e37167 100644 --- a/sys/dev/netif/tx/if_tx.c +++ b/sys/dev/netif/tx/if_tx.c @@ -135,7 +135,7 @@ static device_method_t epic_methods[] = { DEVMETHOD(miibus_statchg, epic_miibus_statchg), DEVMETHOD(miibus_mediainit, epic_miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; static driver_t epic_driver = { diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index aac945f372..b4d6953ff4 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -166,7 +166,7 @@ static device_method_t txp_methods[] = { DEVMETHOD(device_attach, txp_attach), DEVMETHOD(device_detach, txp_detach), DEVMETHOD(device_shutdown, txp_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t txp_driver = { diff --git a/sys/dev/netif/ural/if_ural.c b/sys/dev/netif/ural/if_ural.c index 1bae0e8983..c5d11627b5 100644 --- a/sys/dev/netif/ural/if_ural.c +++ b/sys/dev/netif/ural/if_ural.c @@ -346,7 +346,7 @@ static kobj_method_t ural_methods[] = { DEVMETHOD(device_probe, ural_match), DEVMETHOD(device_attach, ural_attach), DEVMETHOD(device_detach, ural_detach), - {0,0} + DEVMETHOD_END }; static driver_t ural_driver = { diff --git a/sys/dev/netif/vge/if_vge.c b/sys/dev/netif/vge/if_vge.c index 38eca8fcc0..d1bfc9879c 100644 --- a/sys/dev/netif/vge/if_vge.c +++ b/sys/dev/netif/vge/if_vge.c @@ -212,7 +212,7 @@ static device_method_t vge_methods[] = { DEVMETHOD(miibus_writereg, vge_miibus_writereg), DEVMETHOD(miibus_statchg, vge_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t vge_driver = { diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index b32e7475f2..455201382a 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -191,7 +191,7 @@ static device_method_t vr_methods[] = { DEVMETHOD(miibus_writereg, vr_miibus_writereg), DEVMETHOD(miibus_statchg, vr_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t vr_driver = { diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c index c363d063e9..c41a4d6fc7 100644 --- a/sys/dev/netif/vx/if_vx_pci.c +++ b/sys/dev/netif/vx/if_vx_pci.c @@ -89,7 +89,7 @@ static device_method_t vx_methods[] = { DEVMETHOD(device_attach, vx_pci_attach), DEVMETHOD(device_shutdown, vx_pci_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t vx_driver = { diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index 2515ad7110..1a1ff356cd 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -200,7 +200,7 @@ static device_method_t wb_methods[] = { DEVMETHOD(miibus_readreg, wb_miibus_readreg), DEVMETHOD(miibus_writereg, wb_miibus_writereg), DEVMETHOD(miibus_statchg, wb_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static DEFINE_CLASS_0(wb, wb_driver, wb_methods, sizeof(struct wb_softc)); diff --git a/sys/dev/netif/wi/if_wi_pccard.c b/sys/dev/netif/wi/if_wi_pccard.c index 6d9d3e43cb..adbd04fca7 100644 --- a/sys/dev/netif/wi/if_wi_pccard.c +++ b/sys/dev/netif/wi/if_wi_pccard.c @@ -79,7 +79,7 @@ static device_method_t wi_pccard_methods[] = { DEVMETHOD(device_detach, wi_detach), DEVMETHOD(device_shutdown, wi_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t wi_pccard_driver = { diff --git a/sys/dev/netif/wi/if_wi_pci.c b/sys/dev/netif/wi/if_wi_pci.c index 73fe241e3f..1a416c7e10 100644 --- a/sys/dev/netif/wi/if_wi_pci.c +++ b/sys/dev/netif/wi/if_wi_pci.c @@ -78,7 +78,7 @@ static device_method_t wi_pci_methods[] = { DEVMETHOD(device_suspend, wi_pci_suspend), DEVMETHOD(device_resume, wi_pci_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t wi_pci_driver = { diff --git a/sys/dev/netif/wpi/if_wpi.c b/sys/dev/netif/wpi/if_wpi.c index e98e908298..edb23735b0 100644 --- a/sys/dev/netif/wpi/if_wpi.c +++ b/sys/dev/netif/wpi/if_wpi.c @@ -266,7 +266,7 @@ static device_method_t wpi_methods[] = { DEVMETHOD(device_suspend, wpi_suspend), DEVMETHOD(device_resume, wpi_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t wpi_driver = { diff --git a/sys/dev/netif/xe/if_xe_pccard.c b/sys/dev/netif/xe/if_xe_pccard.c index f03ed570ee..03af3593d7 100644 --- a/sys/dev/netif/xe/if_xe_pccard.c +++ b/sys/dev/netif/xe/if_xe_pccard.c @@ -144,7 +144,7 @@ static device_method_t xe_pccard_methods[] = { DEVMETHOD(card_compat_probe, xe_pccard_probe), DEVMETHOD(card_compat_attach, xe_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t xe_pccard_driver = { diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index 39e26e735f..17674b8dc2 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -285,7 +285,7 @@ static device_method_t xl_methods[] = { DEVMETHOD(miibus_statchg, xl_miibus_statchg), DEVMETHOD(miibus_mediainit, xl_miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; static driver_t xl_driver = { diff --git a/sys/dev/pccard/cardbus/cardbus.c b/sys/dev/pccard/cardbus/cardbus.c index 3b2d634b84..65cbf21f85 100644 --- a/sys/dev/pccard/cardbus/cardbus.c +++ b/sys/dev/pccard/cardbus/cardbus.c @@ -364,7 +364,7 @@ static device_method_t cardbus_methods[] = { DEVMETHOD(card_attach_card, cardbus_attach_card), DEVMETHOD(card_detach_card, cardbus_detach_card), - {0,0} + DEVMETHOD_END }; DEFINE_CLASS_1(cardbus, cardbus_driver, cardbus_methods, 0, pci_driver); diff --git a/sys/dev/pccard/pccbb/pccbb_isa.c b/sys/dev/pccard/pccbb/pccbb_isa.c index 5e2ebc4ba2..abbee4e441 100644 --- a/sys/dev/pccard/pccbb/pccbb_isa.c +++ b/sys/dev/pccard/pccbb/pccbb_isa.c @@ -200,7 +200,7 @@ static device_method_t cbb_methods[] = { DEVMETHOD(power_enable_socket, cbb_power_enable_socket), DEVMETHOD(power_disable_socket, cbb_power_disable_socket), - {0,0} + DEVMETHOD_END }; static driver_t cbb_isa_driver = { diff --git a/sys/dev/pccard/pccbb/pccbb_pci.c b/sys/dev/pccard/pccbb/pccbb_pci.c index 97d7e0ee0a..d3ed0dca2e 100644 --- a/sys/dev/pccard/pccbb/pccbb_pci.c +++ b/sys/dev/pccard/pccbb/pccbb_pci.c @@ -650,7 +650,7 @@ static device_method_t cbb_methods[] = { DEVMETHOD(pcib_write_config, cbb_write_config), DEVMETHOD(pcib_route_interrupt, cbb_route_interrupt), - {0,0} + DEVMETHOD_END }; static driver_t cbb_driver = { diff --git a/sys/dev/powermng/alpm/alpm.c b/sys/dev/powermng/alpm/alpm.c index fd7d07e4a0..fadf44d479 100644 --- a/sys/dev/powermng/alpm/alpm.c +++ b/sys/dev/powermng/alpm/alpm.c @@ -641,7 +641,7 @@ static device_method_t alpm_methods[] = { DEVMETHOD(smbus_bwrite, alpm_bwrite), DEVMETHOD(smbus_bread, alpm_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t alpm_driver = { diff --git a/sys/dev/powermng/amdpm/amdpm.c b/sys/dev/powermng/amdpm/amdpm.c index 29c96aeb67..88b0afcd26 100644 --- a/sys/dev/powermng/amdpm/amdpm.c +++ b/sys/dev/powermng/amdpm/amdpm.c @@ -648,7 +648,7 @@ static device_method_t amdpm_methods[] = { DEVMETHOD(smbus_bwrite, amdpm_bwrite), DEVMETHOD(smbus_bread, amdpm_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t amdpm_driver = { diff --git a/sys/dev/powermng/amdsmb/amdsmb.c b/sys/dev/powermng/amdsmb/amdsmb.c index 72620cf151..c3db97d153 100644 --- a/sys/dev/powermng/amdsmb/amdsmb.c +++ b/sys/dev/powermng/amdsmb/amdsmb.c @@ -563,7 +563,7 @@ static device_method_t amdsmb_methods[] = { DEVMETHOD(smbus_bwrite, amdsmb_bwrite), DEVMETHOD(smbus_bread, amdsmb_bread), - { 0, 0 } + DEVMETHOD_END }; static devclass_t amdsmb_devclass; diff --git a/sys/dev/powermng/coretemp/coretemp.c b/sys/dev/powermng/coretemp/coretemp.c index 7de3b74687..f0a2c00640 100644 --- a/sys/dev/powermng/coretemp/coretemp.c +++ b/sys/dev/powermng/coretemp/coretemp.c @@ -72,7 +72,7 @@ static device_method_t coretemp_methods[] = { DEVMETHOD(device_attach, coretemp_attach), DEVMETHOD(device_detach, coretemp_detach), - {0, 0} + DEVMETHOD_END }; static driver_t coretemp_driver = { diff --git a/sys/dev/powermng/ichsmb/ichsmb_pci.c b/sys/dev/powermng/ichsmb/ichsmb_pci.c index 0fa6415e9e..ec4c0e34cb 100644 --- a/sys/dev/powermng/ichsmb/ichsmb_pci.c +++ b/sys/dev/powermng/ichsmb/ichsmb_pci.c @@ -112,7 +112,7 @@ static device_method_t ichsmb_pci_methods[] = { DEVMETHOD(smbus_pcall, ichsmb_pcall), DEVMETHOD(smbus_bwrite, ichsmb_bwrite), DEVMETHOD(smbus_bread, ichsmb_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t ichsmb_pci_driver = { diff --git a/sys/dev/powermng/intpm/intpm.c b/sys/dev/powermng/intpm/intpm.c index fb1a56128a..93517d9760 100644 --- a/sys/dev/powermng/intpm/intpm.c +++ b/sys/dev/powermng/intpm/intpm.c @@ -803,7 +803,7 @@ static device_method_t intsmb_methods[] = { DEVMETHOD(smbus_bwrite, intsmb_bwrite), DEVMETHOD(smbus_bread, intsmb_bread), - { 0, 0 } + DEVMETHOD_END }; static driver_t intsmb_driver = { diff --git a/sys/dev/powermng/it/it.c b/sys/dev/powermng/it/it.c index 76c1b1a73f..bb7a91c5f6 100644 --- a/sys/dev/powermng/it/it.c +++ b/sys/dev/powermng/it/it.c @@ -77,7 +77,7 @@ static device_method_t it_methods[] = { DEVMETHOD(device_detach, it_detach), /* Terminate method list */ - { 0, 0 } + DEVMETHOD_END }; static driver_t it_driver = { diff --git a/sys/dev/powermng/lm/lm78_isa.c b/sys/dev/powermng/lm/lm78_isa.c index 47f25e6701..bef6c2cbd7 100644 --- a/sys/dev/powermng/lm/lm78_isa.c +++ b/sys/dev/powermng/lm/lm78_isa.c @@ -66,7 +66,7 @@ static device_method_t lm_isa_methods[] = { DEVMETHOD(device_detach, lm_isa_detach), /* Terminate method list */ - { 0, 0 } + DEVMETHOD_END }; static driver_t lm_isa_driver = { diff --git a/sys/dev/powermng/viapm/viapm.c b/sys/dev/powermng/viapm/viapm.c index b673d8b1ff..e0fd7ec582 100644 --- a/sys/dev/powermng/viapm/viapm.c +++ b/sys/dev/powermng/viapm/viapm.c @@ -890,7 +890,7 @@ static device_method_t viapm_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t viapm_driver = { @@ -926,7 +926,7 @@ static device_method_t viapropm_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t viapropm_driver = { diff --git a/sys/dev/raid/aac/aac_cam.c b/sys/dev/raid/aac/aac_cam.c index f5de5a9ad4..926e43d309 100644 --- a/sys/dev/raid/aac/aac_cam.c +++ b/sys/dev/raid/aac/aac_cam.c @@ -90,7 +90,7 @@ static device_method_t aac_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 aac_pass_driver = { diff --git a/sys/dev/raid/aac/aac_disk.c b/sys/dev/raid/aac/aac_disk.c index e920887dd2..f5f39e653a 100644 --- a/sys/dev/raid/aac/aac_disk.c +++ b/sys/dev/raid/aac/aac_disk.c @@ -82,7 +82,7 @@ static device_method_t aac_disk_methods[] = { DEVMETHOD(device_probe, aac_disk_probe), DEVMETHOD(device_attach, aac_disk_attach), DEVMETHOD(device_detach, aac_disk_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t aac_disk_driver = { diff --git a/sys/dev/raid/aac/aac_pci.c b/sys/dev/raid/aac/aac_pci.c index 185565185c..39c70e480b 100644 --- a/sys/dev/raid/aac/aac_pci.c +++ b/sys/dev/raid/aac/aac_pci.c @@ -67,7 +67,7 @@ static device_method_t aac_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t aac_pci_driver = { @@ -470,7 +470,7 @@ static device_method_t aacch_methods[] = { DEVMETHOD(device_probe, aacch_probe), DEVMETHOD(device_attach, aacch_attach), DEVMETHOD(device_detach, aacch_detach), - { 0, 0 } + DEVMETHOD_END }; struct aacch_softc { diff --git a/sys/dev/raid/amr/amr_cam.c b/sys/dev/raid/amr/amr_cam.c index 51aa31c5e2..1896fd00e2 100644 --- a/sys/dev/raid/amr/amr_cam.c +++ b/sys/dev/raid/amr/amr_cam.c @@ -93,7 +93,7 @@ static device_method_t amr_pass_methods[] = { DEVMETHOD(device_probe, amr_cam_probe), DEVMETHOD(device_attach, amr_cam_attach), DEVMETHOD(device_detach, amr_cam_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t amr_pass_driver = { diff --git a/sys/dev/raid/amr/amr_disk.c b/sys/dev/raid/amr/amr_disk.c index b51df45b67..c6458cc072 100644 --- a/sys/dev/raid/amr/amr_disk.c +++ b/sys/dev/raid/amr/amr_disk.c @@ -100,7 +100,7 @@ static device_method_t amrd_methods[] = { DEVMETHOD(device_probe, amrd_probe), DEVMETHOD(device_attach, amrd_attach), DEVMETHOD(device_detach, amrd_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t amrd_driver = { diff --git a/sys/dev/raid/amr/amr_pci.c b/sys/dev/raid/amr/amr_pci.c index f123b679b5..0a56b6926f 100644 --- a/sys/dev/raid/amr/amr_pci.c +++ b/sys/dev/raid/amr/amr_pci.c @@ -105,7 +105,7 @@ static device_method_t amr_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t amr_pci_driver = { diff --git a/sys/dev/raid/arcmsr/arcmsr.c b/sys/dev/raid/arcmsr/arcmsr.c index 293924cc4c..19035d8181 100644 --- a/sys/dev/raid/arcmsr/arcmsr.c +++ b/sys/dev/raid/arcmsr/arcmsr.c @@ -207,7 +207,7 @@ static device_method_t arcmsr_methods[]={ DEVMETHOD(device_resume, arcmsr_resume), DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t arcmsr_driver={ diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index 43bd57fcf1..739857ebc6 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -409,7 +409,7 @@ static int ASR_queue(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message); static device_method_t asr_methods[] = { DEVMETHOD(device_probe, asr_probe), DEVMETHOD(device_attach, asr_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t asr_driver = { diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c index a7b1a91666..0532b3cd45 100644 --- a/sys/dev/raid/ciss/ciss.c +++ b/sys/dev/raid/ciss/ciss.c @@ -214,7 +214,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/raid/dpt/dpt_pci.c b/sys/dev/raid/dpt/dpt_pci.c index ea58b08247..f0bc4436fb 100644 --- a/sys/dev/raid/dpt/dpt_pci.c +++ b/sys/dev/raid/dpt/dpt_pci.c @@ -185,7 +185,7 @@ static device_method_t dpt_pci_methods[] = { DEVMETHOD(device_probe, dpt_pci_probe), DEVMETHOD(device_attach, dpt_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t dpt_pci_driver = { diff --git a/sys/dev/raid/hpt27xx/osm_bsd.c b/sys/dev/raid/hpt27xx/osm_bsd.c index 2ec7c17468..0f0d75f42d 100644 --- a/sys/dev/raid/hpt27xx/osm_bsd.c +++ b/sys/dev/raid/hpt27xx/osm_bsd.c @@ -1211,7 +1211,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/raid/hptiop/hptiop.c b/sys/dev/raid/hptiop/hptiop.c index f1468d1e6f..8d8bbb635d 100644 --- a/sys/dev/raid/hptiop/hptiop.c +++ b/sys/dev/raid/hptiop/hptiop.c @@ -1738,7 +1738,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/raid/hptmv/entry.c b/sys/dev/raid/hptmv/entry.c index 96c84af977..344e105baf 100644 --- a/sys/dev/raid/hptmv/entry.c +++ b/sys/dev/raid/hptmv/entry.c @@ -87,7 +87,7 @@ static device_method_t driver_methods[] = { 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/raid/hptrr/hptrr_osm_bsd.c b/sys/dev/raid/hptrr/hptrr_osm_bsd.c index a499c18f8d..124518b245 100644 --- a/sys/dev/raid/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/raid/hptrr/hptrr_osm_bsd.c @@ -1213,7 +1213,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/raid/ida/ida_disk.c b/sys/dev/raid/ida/ida_disk.c index 7caf0ad1dc..c332ac87b2 100644 --- a/sys/dev/raid/ida/ida_disk.c +++ b/sys/dev/raid/ida/ida_disk.c @@ -80,7 +80,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/raid/ida/ida_pci.c b/sys/dev/raid/ida/ida_pci.c index 03d93c5142..c79f13e758 100644 --- a/sys/dev/raid/ida/ida_pci.c +++ b/sys/dev/raid/ida/ida_pci.c @@ -179,7 +179,7 @@ static device_method_t ida_pci_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; static driver_t ida_pci_driver = { diff --git a/sys/dev/raid/iir/iir_pci.c b/sys/dev/raid/iir/iir_pci.c index 31d6029466..e9ee81a050 100644 --- a/sys/dev/raid/iir/iir_pci.c +++ b/sys/dev/raid/iir/iir_pci.c @@ -136,7 +136,7 @@ static device_method_t iir_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, iir_pci_probe), DEVMETHOD(device_attach, iir_pci_attach), - { 0, 0} + DEVMETHOD_END }; diff --git a/sys/dev/raid/ips/ips_disk.c b/sys/dev/raid/ips/ips_disk.c index 72b2efb699..1b18a65ad9 100644 --- a/sys/dev/raid/ips/ips_disk.c +++ b/sys/dev/raid/ips/ips_disk.c @@ -64,7 +64,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 }; diff --git a/sys/dev/raid/ips/ips_pci.c b/sys/dev/raid/ips/ips_pci.c index aa52f2a2e5..011e7e49ab 100644 --- a/sys/dev/raid/ips/ips_pci.c +++ b/sys/dev/raid/ips/ips_pci.c @@ -227,7 +227,7 @@ static device_method_t ips_driver_methods[] = { DEVMETHOD(device_attach, ips_pci_attach), DEVMETHOD(device_detach, ips_pci_detach), DEVMETHOD(device_shutdown, ips_pci_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t ips_pci_driver = { diff --git a/sys/dev/raid/mfi/mfi_cam.c b/sys/dev/raid/mfi/mfi_cam.c index 6385172771..3a45f2b740 100644 --- a/sys/dev/raid/mfi/mfi_cam.c +++ b/sys/dev/raid/mfi/mfi_cam.c @@ -79,7 +79,7 @@ static device_method_t mfip_methods[] = { DEVMETHOD(device_probe, mfip_probe), DEVMETHOD(device_attach, mfip_attach), DEVMETHOD(device_detach, mfip_detach), - {0, 0} + DEVMETHOD_END }; static driver_t mfip_driver = { "mfip", diff --git a/sys/dev/raid/mfi/mfi_disk.c b/sys/dev/raid/mfi/mfi_disk.c index 8fb9790d44..0cc4738957 100644 --- a/sys/dev/raid/mfi/mfi_disk.c +++ b/sys/dev/raid/mfi/mfi_disk.c @@ -74,7 +74,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/raid/mfi/mfi_pci.c b/sys/dev/raid/mfi/mfi_pci.c index 2a8fe0c05f..63be40fc01 100644 --- a/sys/dev/raid/mfi/mfi_pci.c +++ b/sys/dev/raid/mfi/mfi_pci.c @@ -91,7 +91,7 @@ static device_method_t mfi_methods[] = { DEVMETHOD(device_resume, mfi_pci_resume), DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t mfi_pci_driver = { diff --git a/sys/dev/raid/mfi/mfi_syspd.c b/sys/dev/raid/mfi/mfi_syspd.c index 2524d2cf14..143af6b618 100644 --- a/sys/dev/raid/mfi/mfi_syspd.c +++ b/sys/dev/raid/mfi/mfi_syspd.c @@ -80,7 +80,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/raid/mlx/mlx_disk.c b/sys/dev/raid/mlx/mlx_disk.c index fada77cba8..2d249902a8 100644 --- a/sys/dev/raid/mlx/mlx_disk.c +++ b/sys/dev/raid/mlx/mlx_disk.c @@ -72,7 +72,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/raid/mlx/mlx_pci.c b/sys/dev/raid/mlx/mlx_pci.c index 184ede53fb..7955bc3ba3 100644 --- a/sys/dev/raid/mlx/mlx_pci.c +++ b/sys/dev/raid/mlx/mlx_pci.c @@ -57,7 +57,7 @@ static device_method_t mlx_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t mlx_pci_driver = { diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c index 890cfffc84..cb788a300c 100644 --- a/sys/dev/raid/mly/mly.c +++ b/sys/dev/raid/mly/mly.c @@ -135,7 +135,7 @@ static device_method_t mly_methods[] = { DEVMETHOD(device_attach, mly_attach), DEVMETHOD(device_detach, mly_detach), DEVMETHOD(device_shutdown, mly_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t mly_pci_driver = { diff --git a/sys/dev/raid/mps/mps_pci.c b/sys/dev/raid/mps/mps_pci.c index c4c80a363a..c7afe009d2 100644 --- a/sys/dev/raid/mps/mps_pci.c +++ b/sys/dev/raid/mps/mps_pci.c @@ -75,7 +75,7 @@ static device_method_t mps_methods[] = { DEVMETHOD(device_suspend, mps_pci_suspend), DEVMETHOD(device_resume, mps_pci_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t mps_pci_driver = { diff --git a/sys/dev/raid/pst/pst-pci.c b/sys/dev/raid/pst/pst-pci.c index dfb9d0e5fb..f7fe77bd70 100644 --- a/sys/dev/raid/pst/pst-pci.c +++ b/sys/dev/raid/pst/pst-pci.c @@ -104,7 +104,7 @@ iop_pci_attach(device_t dev) static device_method_t pst_pci_methods[] = { DEVMETHOD(device_probe, iop_pci_probe), DEVMETHOD(device_attach, iop_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t pst_pci_driver = { diff --git a/sys/dev/raid/pst/pst-raid.c b/sys/dev/raid/pst/pst-raid.c index c0e763b919..e9c4fa6452 100644 --- a/sys/dev/raid/pst/pst-raid.c +++ b/sys/dev/raid/pst/pst-raid.c @@ -392,7 +392,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/raid/twa/tw_osl_freebsd.c b/sys/dev/raid/twa/tw_osl_freebsd.c index e18c41dcf6..ac3ae08d21 100644 --- a/sys/dev/raid/twa/tw_osl_freebsd.c +++ b/sys/dev/raid/twa/tw_osl_freebsd.c @@ -203,7 +203,7 @@ static device_method_t twa_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - {0, 0} + DEVMETHOD_END }; static driver_t twa_pci_driver = { diff --git a/sys/dev/raid/twe/twe_freebsd.c b/sys/dev/raid/twe/twe_freebsd.c index acf4bde8ef..95f436ec15 100644 --- a/sys/dev/raid/twe/twe_freebsd.c +++ b/sys/dev/raid/twe/twe_freebsd.c @@ -148,7 +148,7 @@ static device_method_t twe_methods[] = { DEVMETHOD(device_suspend, twe_suspend), DEVMETHOD(device_resume, twe_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t twe_pci_driver = { @@ -664,7 +664,7 @@ static device_method_t twed_methods[] = { DEVMETHOD(device_probe, twed_probe), DEVMETHOD(device_attach, twed_attach), DEVMETHOD(device_detach, twed_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t twed_driver = { diff --git a/sys/dev/raid/tws/tws.c b/sys/dev/raid/tws/tws.c index 3fabc01f4d..b4f75b710b 100644 --- a/sys/dev/raid/tws/tws.c +++ b/sys/dev/raid/tws/tws.c @@ -850,7 +850,7 @@ static device_method_t tws_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t tws_driver = { diff --git a/sys/dev/serial/digi/digi_isa.c b/sys/dev/serial/digi/digi_isa.c index d8af9c7acc..778a77786f 100644 --- a/sys/dev/serial/digi/digi_isa.c +++ b/sys/dev/serial/digi/digi_isa.c @@ -459,7 +459,7 @@ static device_method_t digi_isa_methods[] = { DEVMETHOD(device_attach, digi_isa_attach), DEVMETHOD(device_detach, digi_detach), DEVMETHOD(device_shutdown, digi_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t digi_isa_drv = { diff --git a/sys/dev/serial/digi/digi_pci.c b/sys/dev/serial/digi/digi_pci.c index 7c6c6b8f78..06e5224d30 100644 --- a/sys/dev/serial/digi/digi_pci.c +++ b/sys/dev/serial/digi/digi_pci.c @@ -217,7 +217,7 @@ static device_method_t digi_pci_methods[] = { DEVMETHOD(device_attach, digi_pci_attach), DEVMETHOD(device_detach, digi_detach), DEVMETHOD(device_shutdown, digi_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t digi_pci_drv = { diff --git a/sys/dev/serial/rp/rp_isa.c b/sys/dev/serial/rp/rp_isa.c index e1c1339d47..2160263098 100644 --- a/sys/dev/serial/rp/rp_isa.c +++ b/sys/dev/serial/rp/rp_isa.c @@ -475,7 +475,7 @@ static device_method_t rp_methods[] = { DEVMETHOD(device_probe, rp_probe), DEVMETHOD(device_attach, rp_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t rp_driver = { diff --git a/sys/dev/serial/rp/rp_pci.c b/sys/dev/serial/rp/rp_pci.c index 7bc0bd67b4..34591c0405 100644 --- a/sys/dev/serial/rp/rp_pci.c +++ b/sys/dev/serial/rp/rp_pci.c @@ -335,7 +335,7 @@ static device_method_t rp_pcimethods[] = { DEVMETHOD(device_shutdown, rp_pcishutdown), #endif /* notdef */ - { 0, 0 } + DEVMETHOD_END }; static driver_t rp_pcidriver = { diff --git a/sys/dev/serial/si/si_isa.c b/sys/dev/serial/si/si_isa.c index 4025597091..b87a208f45 100644 --- a/sys/dev/serial/si/si_isa.c +++ b/sys/dev/serial/si/si_isa.c @@ -313,7 +313,7 @@ static device_method_t si_isa_methods[] = { DEVMETHOD(device_probe, si_isa_probe), DEVMETHOD(device_attach, si_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t si_isa_driver = { diff --git a/sys/dev/serial/si/si_pci.c b/sys/dev/serial/si/si_pci.c index 445b856b74..bcc81e027c 100644 --- a/sys/dev/serial/si/si_pci.c +++ b/sys/dev/serial/si/si_pci.c @@ -126,7 +126,7 @@ static device_method_t si_pci_methods[] = { DEVMETHOD(device_probe, si_pci_probe), DEVMETHOD(device_attach, si_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t si_pci_driver = { diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index d814a31769..f6f742a627 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -198,7 +198,7 @@ static device_method_t sio_isa_methods[] = { DEVMETHOD(device_probe, sio_isa_probe), DEVMETHOD(device_attach, sio_isa_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sio_isa_driver = { @@ -213,7 +213,7 @@ static device_method_t sio_pci_methods[] = { DEVMETHOD(device_probe, sio_pci_probe), DEVMETHOD(device_attach, sio_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sio_pci_driver = { @@ -229,7 +229,7 @@ static device_method_t sio_puc_methods[] = { DEVMETHOD(device_probe, sio_puc_probe), DEVMETHOD(device_attach, sio_puc_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sio_puc_driver = { diff --git a/sys/dev/serial/sio/sio_pccard.c b/sys/dev/serial/sio/sio_pccard.c index 95b124c53f..b38d80f3ec 100644 --- a/sys/dev/serial/sio/sio_pccard.c +++ b/sys/dev/serial/sio/sio_pccard.c @@ -65,7 +65,7 @@ static device_method_t sio_pccard_methods[] = { DEVMETHOD(card_compat_probe, sio_pccard_probe), DEVMETHOD(card_compat_attach, sio_pccard_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t sio_pccard_driver = { diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 3247228cdf..406f5df9f5 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -919,7 +919,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 17b950d935..be88d7206d 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -1118,7 +1118,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/au88x0.c b/sys/dev/sound/pci/au88x0.c index 7322e43052..d66e5dae50 100644 --- a/sys/dev/sound/pci/au88x0.c +++ b/sys/dev/sound/pci/au88x0.c @@ -716,7 +716,7 @@ static device_method_t au88x0_methods[] = { DEVMETHOD(device_probe, au88x0_pci_probe), DEVMETHOD(device_attach, au88x0_pci_attach), DEVMETHOD(device_detach, au88x0_pci_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t au88x0_driver = { diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index 2f1b4e5a6c..fa166532e4 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -671,7 +671,7 @@ static device_method_t au_methods[] = { DEVMETHOD(device_probe, au_pci_probe), DEVMETHOD(device_attach, au_pci_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t au_driver = { diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index c4508d4b51..acc885ac3b 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -988,7 +988,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 2f86ac9380..71075a3d7e 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -944,7 +944,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/csa.c b/sys/dev/sound/pci/csa.c index b783e05e8f..d3092564c8 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -1054,7 +1054,7 @@ static device_method_t csa_methods[] = { DEVMETHOD(bus_setup_intr, csa_setup_intr), DEVMETHOD(bus_teardown_intr, csa_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t csa_driver = { diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 56a134555d..308ee0d308 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -1021,7 +1021,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/ds1.c b/sys/dev/sound/pci/ds1.c index a390be40ab..a1e6ccedbc 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -1087,7 +1087,7 @@ static device_method_t ds1_methods[] = { DEVMETHOD(device_attach, ds_pci_attach), DEVMETHOD(device_detach, ds_pci_detach), DEVMETHOD(device_resume, ds_pci_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t ds1_driver = { diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 6059596410..4eb525044f 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -2019,7 +2019,7 @@ static device_method_t emu_methods[] = { DEVMETHOD(device_attach, emu_pci_attach), DEVMETHOD(device_detach, emu_pci_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t emu_driver = { @@ -2071,7 +2071,7 @@ static device_method_t emujoy_methods[] = { DEVMETHOD(device_attach, emujoy_pci_attach), DEVMETHOD(device_detach, emujoy_pci_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t emujoy_driver = { diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 048a80471f..e87dd4f640 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -2620,7 +2620,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 4453c8445a..73aaac3c14 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -2562,7 +2562,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 9f71188908..2e82990790 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1604,7 +1604,7 @@ static device_method_t es_methods[] = { 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/fm801.c b/sys/dev/sound/pci/fm801.c index a5c4fb7305..d8639b43ce 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -750,7 +750,7 @@ static device_method_t fm801_methods[] = { DEVMETHOD(bus_release_resource, fm801_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - { 0, 0} + DEVMETHOD_END }; static driver_t fm801_driver = { diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index f9ffd2055a..1229e71cb8 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -6455,7 +6455,7 @@ static device_method_t hdac_methods[] = { DEVMETHOD(device_probe, hdac_probe), DEVMETHOD(device_attach, hdac_attach), DEVMETHOD(device_detach, hdac_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t hdac_driver = { diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index b49873f2fb..06ef3b4b16 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -1258,7 +1258,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/maestro.c b/sys/dev/sound/pci/maestro.c index 6c8390df1d..82ff53783b 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -2047,7 +2047,7 @@ static device_method_t agg_methods[] = { DEVMETHOD(device_resume, agg_resume), DEVMETHOD(device_shutdown, agg_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t agg_driver = { diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index a62b104312..55666bf1ac 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -1725,7 +1725,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 cba2dadcd1..acacb48b29 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -811,7 +811,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 38f0cca312..24e7b69259 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -1092,7 +1092,7 @@ static device_method_t ess_methods[] = { 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 87555e6bab..171bdf0844 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -993,7 +993,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/via8233.c b/sys/dev/sound/pci/via8233.c index d2e6aacd38..04b900e164 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -1082,7 +1082,7 @@ static device_method_t via_methods[] = { DEVMETHOD(device_probe, via_probe), DEVMETHOD(device_attach, via_attach), DEVMETHOD(device_detach, via_detach), - { 0, 0} + DEVMETHOD_END }; static driver_t via_driver = { diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index f3681bf346..bcc6a0273c 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -637,7 +637,7 @@ static device_method_t via_methods[] = { DEVMETHOD(device_probe, via_probe), DEVMETHOD(device_attach, via_attach), DEVMETHOD(device_detach, via_detach), - { 0, 0} + DEVMETHOD_END }; static driver_t via_driver = { diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 60189ad5c2..69d21b9aa8 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -927,7 +927,7 @@ static device_method_t sc_methods[] = { DEVMETHOD(device_detach, sv_detach), DEVMETHOD(device_resume, sv_resume), DEVMETHOD(device_suspend, sv_suspend), - { 0, 0 } + DEVMETHOD_END }; static driver_t sonicvibes_driver = { diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 3d0751f499..703825bc4e 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -343,7 +343,7 @@ static kobj_method_t uaudio_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(bus_print_child, bus_generic_print_child), - {0,0} + DEVMETHOD_END }; static driver_t uaudio_driver = { diff --git a/sys/dev/sound/usb/uaudio_pcm.c b/sys/dev/sound/usb/uaudio_pcm.c index 451d5432e6..7bf8e79fa1 100644 --- a/sys/dev/sound/usb/uaudio_pcm.c +++ b/sys/dev/sound/usb/uaudio_pcm.c @@ -401,7 +401,7 @@ static device_method_t ua_pcm_methods[] = { DEVMETHOD(device_attach, ua_attach), DEVMETHOD(device_detach, ua_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ua_pcm_driver = { diff --git a/sys/dev/usbmisc/moscom/moscom.c b/sys/dev/usbmisc/moscom/moscom.c index ddf8a6a49a..ec92208883 100644 --- a/sys/dev/usbmisc/moscom/moscom.c +++ b/sys/dev/usbmisc/moscom/moscom.c @@ -169,7 +169,7 @@ static device_method_t moscom_methods[] = { DEVMETHOD(device_probe, moscom_match), DEVMETHOD(device_attach, moscom_attach), DEVMETHOD(device_detach, moscom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t moscom_driver = { diff --git a/sys/dev/usbmisc/uark/uark.c b/sys/dev/usbmisc/uark/uark.c index c4e75db7a2..7186e1f954 100644 --- a/sys/dev/usbmisc/uark/uark.c +++ b/sys/dev/usbmisc/uark/uark.c @@ -96,7 +96,7 @@ static device_method_t uark_methods[] = { DEVMETHOD(device_probe, uark_match), DEVMETHOD(device_attach, uark_attach), DEVMETHOD(device_detach, uark_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uark_driver = { diff --git a/sys/dev/usbmisc/ubsa/ubsa.c b/sys/dev/usbmisc/ubsa/ubsa.c index 093823bb47..3724eaf6fe 100644 --- a/sys/dev/usbmisc/ubsa/ubsa.c +++ b/sys/dev/usbmisc/ubsa/ubsa.c @@ -220,7 +220,7 @@ static device_method_t ubsa_methods[] = { DEVMETHOD(device_probe, ubsa_match), DEVMETHOD(device_attach, ubsa_attach), DEVMETHOD(device_detach, ubsa_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ubsa_driver = { diff --git a/sys/dev/usbmisc/ubt/ubt.c b/sys/dev/usbmisc/ubt/ubt.c index 8f79667fe1..11fdc973b8 100644 --- a/sys/dev/usbmisc/ubt/ubt.c +++ b/sys/dev/usbmisc/ubt/ubt.c @@ -275,8 +275,7 @@ static device_method_t ubt_methods[] = { DEVMETHOD(device_probe, ubt_match), DEVMETHOD(device_attach, ubt_attach), DEVMETHOD(device_detach, ubt_detach), - {0,0}, - {0,0} + DEVMETHOD_END }; static driver_t ubt_driver = { diff --git a/sys/dev/usbmisc/uchcom/uchcom.c b/sys/dev/usbmisc/uchcom/uchcom.c index c357eef0a9..4a055d389e 100644 --- a/sys/dev/usbmisc/uchcom/uchcom.c +++ b/sys/dev/usbmisc/uchcom/uchcom.c @@ -189,7 +189,7 @@ static device_method_t uchcom_methods[] = { DEVMETHOD(device_probe, uchcom_match), DEVMETHOD(device_attach, uchcom_attach), DEVMETHOD(device_detach, uchcom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uchcom_driver = { diff --git a/sys/dev/usbmisc/ufm/ufm.c b/sys/dev/usbmisc/ufm/ufm.c index 973a25329f..962788e3c4 100644 --- a/sys/dev/usbmisc/ufm/ufm.c +++ b/sys/dev/usbmisc/ufm/ufm.c @@ -106,7 +106,7 @@ static kobj_method_t ufm_methods[] = { DEVMETHOD(device_probe, ufm_match), DEVMETHOD(device_attach, ufm_attach), DEVMETHOD(device_detach, ufm_detach), - {0,0} + DEVMETHOD_END }; static driver_t ufm_driver = { diff --git a/sys/dev/usbmisc/uftdi/uftdi.c b/sys/dev/usbmisc/uftdi/uftdi.c index 2ca1496293..83fb09dfd7 100644 --- a/sys/dev/usbmisc/uftdi/uftdi.c +++ b/sys/dev/usbmisc/uftdi/uftdi.c @@ -985,7 +985,7 @@ static device_method_t uftdi_methods[] = { DEVMETHOD(device_attach, uftdi_attach), DEVMETHOD(device_detach, uftdi_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uftdi_driver = { diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c index c813d388aa..1b774ac60a 100644 --- a/sys/dev/usbmisc/ugen/ugen.c +++ b/sys/dev/usbmisc/ugen/ugen.c @@ -184,7 +184,7 @@ static kobj_method_t ugen_methods[] = { DEVMETHOD(device_probe, ugen_match), DEVMETHOD(device_attach, ugen_attach), DEVMETHOD(device_detach, ugen_detach), - {0,0} + DEVMETHOD_END }; static driver_t ugen_driver = { diff --git a/sys/dev/usbmisc/ugensa/ugensa.c b/sys/dev/usbmisc/ugensa/ugensa.c index ac062c476a..f5db5d12db 100644 --- a/sys/dev/usbmisc/ugensa/ugensa.c +++ b/sys/dev/usbmisc/ugensa/ugensa.c @@ -82,7 +82,7 @@ static device_method_t ugensa_methods[] = { DEVMETHOD(device_probe, ugensa_match), DEVMETHOD(device_attach, ugensa_attach), DEVMETHOD(device_detach, ugensa_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ugensa_driver = { diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c index 16418492fb..8086b8da58 100644 --- a/sys/dev/usbmisc/uhid/uhid.c +++ b/sys/dev/usbmisc/uhid/uhid.c @@ -162,7 +162,7 @@ static kobj_method_t uhid_methods[] = { DEVMETHOD(device_probe, uhid_match), DEVMETHOD(device_attach, uhid_attach), DEVMETHOD(device_detach, uhid_detach), - {0,0} + DEVMETHOD_END }; static driver_t uhid_driver = { diff --git a/sys/dev/usbmisc/ukbd/ukbd.c b/sys/dev/usbmisc/ukbd/ukbd.c index 974eedea91..63218156c0 100644 --- a/sys/dev/usbmisc/ukbd/ukbd.c +++ b/sys/dev/usbmisc/ukbd/ukbd.c @@ -134,7 +134,7 @@ static kobj_method_t ukbd_methods[] = { DEVMETHOD(device_attach, ukbd_attach), DEVMETHOD(device_detach, ukbd_detach), DEVMETHOD(device_resume, ukbd_resume), - {0,0} + DEVMETHOD_END }; static driver_t ukbd_driver = { diff --git a/sys/dev/usbmisc/ulpt/ulpt.c b/sys/dev/usbmisc/ulpt/ulpt.c index 62bd08e970..f746faef12 100644 --- a/sys/dev/usbmisc/ulpt/ulpt.c +++ b/sys/dev/usbmisc/ulpt/ulpt.c @@ -168,7 +168,7 @@ static kobj_method_t ulpt_methods[] = { DEVMETHOD(device_probe, ulpt_match), DEVMETHOD(device_attach, ulpt_attach), DEVMETHOD(device_detach, ulpt_detach), - {0,0} + DEVMETHOD_END }; static driver_t ulpt_driver = { diff --git a/sys/dev/usbmisc/umass/umass.c b/sys/dev/usbmisc/umass/umass.c index 3808d3759d..301466a02a 100644 --- a/sys/dev/usbmisc/umass/umass.c +++ b/sys/dev/usbmisc/umass/umass.c @@ -1113,8 +1113,7 @@ static kobj_method_t umass_methods[] = { DEVMETHOD(device_probe, umass_match), DEVMETHOD(device_attach, umass_attach), DEVMETHOD(device_detach, umass_detach), - {0,0}, - {0,0} + DEVMETHOD_END }; static driver_t umass_driver = { diff --git a/sys/dev/usbmisc/umct/umct.c b/sys/dev/usbmisc/umct/umct.c index f53c756b67..ef76d57d12 100644 --- a/sys/dev/usbmisc/umct/umct.c +++ b/sys/dev/usbmisc/umct/umct.c @@ -121,7 +121,7 @@ static device_method_t umct_methods[] = { DEVMETHOD(device_probe, umct_match), DEVMETHOD(device_attach, umct_attach), DEVMETHOD(device_detach, umct_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t umct_driver = { diff --git a/sys/dev/usbmisc/umodem/umodem.c b/sys/dev/usbmisc/umodem/umodem.c index bf05af407d..6568d65db2 100644 --- a/sys/dev/usbmisc/umodem/umodem.c +++ b/sys/dev/usbmisc/umodem/umodem.c @@ -194,7 +194,7 @@ static device_method_t umodem_methods[] = { DEVMETHOD(device_probe, umodem_match), DEVMETHOD(device_attach, umodem_attach), DEVMETHOD(device_detach, umodem_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t umodem_driver = { diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c index 422828a583..c46747777f 100644 --- a/sys/dev/usbmisc/ums/ums.c +++ b/sys/dev/usbmisc/ums/ums.c @@ -163,7 +163,7 @@ static kobj_method_t ums_methods[] = { DEVMETHOD(device_probe, ums_match), DEVMETHOD(device_attach, ums_attach), DEVMETHOD(device_detach, ums_detach), - {0,0} + DEVMETHOD_END }; static driver_t ums_driver = { diff --git a/sys/dev/usbmisc/uplcom/uplcom.c b/sys/dev/usbmisc/uplcom/uplcom.c index 5622af9e53..2ba12313ab 100644 --- a/sys/dev/usbmisc/uplcom/uplcom.c +++ b/sys/dev/usbmisc/uplcom/uplcom.c @@ -261,7 +261,7 @@ static device_method_t uplcom_methods[] = { DEVMETHOD(device_probe, uplcom_match), DEVMETHOD(device_attach, uplcom_attach), DEVMETHOD(device_detach, uplcom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uplcom_driver = { diff --git a/sys/dev/usbmisc/urio/urio.c b/sys/dev/usbmisc/urio/urio.c index 22fccc6f14..2e8b0e87ad 100644 --- a/sys/dev/usbmisc/urio/urio.c +++ b/sys/dev/usbmisc/urio/urio.c @@ -134,7 +134,7 @@ static kobj_method_t urio_methods[] = { DEVMETHOD(device_probe, urio_match), DEVMETHOD(device_attach, urio_attach), DEVMETHOD(device_detach, urio_detach), - {0,0} + DEVMETHOD_END }; static driver_t urio_driver = { diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c index 593f80f356..ddd7ad01b3 100644 --- a/sys/dev/usbmisc/uscanner/uscanner.c +++ b/sys/dev/usbmisc/uscanner/uscanner.c @@ -280,7 +280,7 @@ static kobj_method_t uscanner_methods[] = { DEVMETHOD(device_probe, uscanner_match), DEVMETHOD(device_attach, uscanner_attach), DEVMETHOD(device_detach, uscanner_detach), - {0,0} + DEVMETHOD_END }; static driver_t uscanner_driver = { diff --git a/sys/dev/usbmisc/uslcom/uslcom.c b/sys/dev/usbmisc/uslcom/uslcom.c index 3186495b63..13c3c4fae8 100644 --- a/sys/dev/usbmisc/uslcom/uslcom.c +++ b/sys/dev/usbmisc/uslcom/uslcom.c @@ -143,7 +143,7 @@ static device_method_t uslcom_methods[] = { DEVMETHOD(device_probe, uslcom_match), DEVMETHOD(device_attach, uslcom_attach), DEVMETHOD(device_detach, uslcom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uslcom_driver = { diff --git a/sys/dev/usbmisc/uticom/uticom.c b/sys/dev/usbmisc/uticom/uticom.c index f4bbfa5327..6d9c88cd19 100644 --- a/sys/dev/usbmisc/uticom/uticom.c +++ b/sys/dev/usbmisc/uticom/uticom.c @@ -189,7 +189,7 @@ static device_method_t uticom_methods[] = { DEVMETHOD(device_probe, uticom_match), DEVMETHOD(device_attach, uticom_attach), DEVMETHOD(device_detach, uticom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uticom_driver = { diff --git a/sys/dev/usbmisc/uvisor/uvisor.c b/sys/dev/usbmisc/uvisor/uvisor.c index e2b22728d3..f31fd9a881 100644 --- a/sys/dev/usbmisc/uvisor/uvisor.c +++ b/sys/dev/usbmisc/uvisor/uvisor.c @@ -182,7 +182,7 @@ static device_method_t uvisor_methods[] = { DEVMETHOD(device_probe, uvisor_match), DEVMETHOD(device_attach, uvisor_attach), DEVMETHOD(device_detach, uvisor_detach), - { 0, 0 } + DEVMETHOD_END }; diff --git a/sys/dev/usbmisc/uvscom/uvscom.c b/sys/dev/usbmisc/uvscom/uvscom.c index 730cc2f0ef..a05c0471bf 100644 --- a/sys/dev/usbmisc/uvscom/uvscom.c +++ b/sys/dev/usbmisc/uvscom/uvscom.c @@ -212,7 +212,7 @@ static device_method_t uvscom_methods[] = { DEVMETHOD(device_probe, uvscom_match), DEVMETHOD(device_attach, uvscom_attach), DEVMETHOD(device_detach, uvscom_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t uvscom_driver = { diff --git a/sys/dev/video/bktr/bktr_os.c b/sys/dev/video/bktr/bktr_os.c index a8260ee048..b5675e19bd 100644 --- a/sys/dev/video/bktr/bktr_os.c +++ b/sys/dev/video/bktr/bktr_os.c @@ -143,7 +143,7 @@ static device_method_t bktr_methods[] = { DEVMETHOD(smbus_readb, bti2c_smb_readb), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t bktr_driver = { diff --git a/sys/dev/video/cxm/cxm.c b/sys/dev/video/cxm/cxm.c index 2b9ee89ece..d3b2cd8e32 100644 --- a/sys/dev/video/cxm/cxm.c +++ b/sys/dev/video/cxm/cxm.c @@ -105,7 +105,7 @@ static device_method_t cxm_methods[] = { DEVMETHOD(bus_read_ivar, cxm_read_ivar), DEVMETHOD(bus_write_ivar, cxm_write_ivar), - { 0, 0 } + DEVMETHOD_END }; static driver_t cxm_driver = { diff --git a/sys/dev/video/cxm/cxm_i2c.c b/sys/dev/video/cxm/cxm_i2c.c index 1b164cea48..8a64a126a6 100644 --- a/sys/dev/video/cxm/cxm_i2c.c +++ b/sys/dev/video/cxm/cxm_i2c.c @@ -89,7 +89,7 @@ static device_method_t cxm_iic_methods[] = { DEVMETHOD(iicbb_setscl, cxm_iic_setscl), DEVMETHOD(iicbb_setsda, cxm_iic_setsda), - { 0, 0 } + DEVMETHOD_END }; static driver_t cxm_iic_driver = { diff --git a/sys/dev/video/fb/fb.c b/sys/dev/video/fb/fb.c index 57b849ab4e..6ebeb8db20 100644 --- a/sys/dev/video/fb/fb.c +++ b/sys/dev/video/fb/fb.c @@ -328,7 +328,7 @@ static device_method_t fb_methods[] = { DEVMETHOD(device_attach, fbattach), DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; static driver_t fb_driver = { diff --git a/sys/dev/virtual/virtio/block/virtio_blk.c b/sys/dev/virtual/virtio/block/virtio_blk.c index 58244158fe..1dd2a9e854 100644 --- a/sys/dev/virtual/virtio/block/virtio_blk.c +++ b/sys/dev/virtual/virtio/block/virtio_blk.c @@ -182,7 +182,7 @@ static device_method_t vtblk_methods[] = { DEVMETHOD(device_resume, vtblk_resume), DEVMETHOD(device_shutdown, vtblk_shutdown), - { 0, 0 } + DEVMETHOD_END }; static driver_t vtblk_driver = { diff --git a/sys/dev/virtual/virtio/pci/virtio_pci.c b/sys/dev/virtual/virtio/pci/virtio_pci.c index bd96d7ca9a..52127205fe 100644 --- a/sys/dev/virtual/virtio/pci/virtio_pci.c +++ b/sys/dev/virtual/virtio/pci/virtio_pci.c @@ -189,7 +189,7 @@ static device_method_t vtpci_methods[] = { DEVMETHOD(virtio_bus_read_device_config, vtpci_read_dev_config), DEVMETHOD(virtio_bus_write_device_config, vtpci_write_dev_config), - { 0, 0 } + DEVMETHOD_END }; static driver_t vtpci_driver = { diff --git a/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c index ce5393e30a..8c7d555360 100644 --- a/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c +++ b/sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c @@ -1181,7 +1181,7 @@ static device_method_t bt3c_pccard_methods[] = { DEVMETHOD(device_attach, bt3c_pccard_attach), DEVMETHOD(device_detach, bt3c_pccard_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t bt3c_pccard_driver = { diff --git a/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c index 5f67512a4f..3dbbea3159 100644 --- a/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c @@ -75,7 +75,7 @@ static device_method_t ubt_methods[] = { DEVMETHOD(device_attach, ubt_attach), DEVMETHOD(device_detach, ubt_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ubt_driver = { diff --git a/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c index 2fe2fb3a0a..43fcb9b1b4 100644 --- a/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c +++ b/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c @@ -29,7 +29,6 @@ * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.18 2007/06/23 04:34:38 imp Exp $ - * $DragonFly: src/sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.2 2008/06/26 23:05:40 dillon Exp $ */ #include @@ -122,7 +121,7 @@ static device_method_t ubtbcmfw_methods[] = { DEVMETHOD(device_attach, ubtbcmfw_attach), DEVMETHOD(device_detach, ubtbcmfw_detach), - { 0, 0 } + DEVMETHOD_END }; static driver_t ubtbcmfw_driver = { diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 02b0467e3a..23623a7d0e 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -1391,7 +1391,7 @@ static device_method_t swcr_methods[] = { DEVMETHOD(cryptodev_freesession,swcr_freesession), DEVMETHOD(cryptodev_process, swcr_process), - {0, 0}, + DEVMETHOD_END }; static driver_t swcr_driver = { diff --git a/sys/platform/pc32/apm/apm.c b/sys/platform/pc32/apm/apm.c index 23766a107c..4fc318eb06 100644 --- a/sys/platform/pc32/apm/apm.c +++ b/sys/platform/pc32/apm/apm.c @@ -1412,7 +1412,7 @@ static device_method_t apm_methods[] = { DEVMETHOD(device_probe, apm_probe), DEVMETHOD(device_attach, apm_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t apm_driver = { diff --git a/sys/platform/pc32/i386/cs5536.c b/sys/platform/pc32/i386/cs5536.c index c8e2cbc0cd..30345a1ebc 100644 --- a/sys/platform/pc32/i386/cs5536.c +++ b/sys/platform/pc32/i386/cs5536.c @@ -485,7 +485,7 @@ static device_method_t cs5536_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t cs5536_driver = { diff --git a/sys/platform/pc32/i386/geode.c b/sys/platform/pc32/i386/geode.c index 1fefa5477e..e906fb474e 100644 --- a/sys/platform/pc32/i386/geode.c +++ b/sys/platform/pc32/i386/geode.c @@ -218,7 +218,7 @@ static device_method_t geode_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t geode_driver = { diff --git a/sys/platform/pc32/i386/mp_clock.c b/sys/platform/pc32/i386/mp_clock.c index 8c4b73a73e..7425ae6230 100644 --- a/sys/platform/pc32/i386/mp_clock.c +++ b/sys/platform/pc32/i386/mp_clock.c @@ -125,7 +125,7 @@ static device_method_t piix_methods[] = { /* Device interface */ DEVMETHOD(device_probe, piix_probe), DEVMETHOD(device_attach, piix_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t piix_driver = { diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index e74534a6b7..74a0faa64d 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -151,7 +151,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(pcib_release_msix, nexus_release_msix), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t nexus_driver = { diff --git a/sys/platform/pc32/i386/pnpbios.c b/sys/platform/pc32/i386/pnpbios.c index 8fcc26d04e..2c91ef6179 100644 --- a/sys/platform/pc32/i386/pnpbios.c +++ b/sys/platform/pc32/i386/pnpbios.c @@ -247,7 +247,7 @@ static device_method_t pnpbios_methods[] = { /* Device interface */ DEVMETHOD(device_identify, pnpbios_identify), - { 0, 0 } + DEVMETHOD_END }; static driver_t pnpbios_driver = { diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c index e2c8ed7eea..8788c54fae 100644 --- a/sys/platform/pc32/isa/npx.c +++ b/sys/platform/pc32/isa/npx.c @@ -908,7 +908,7 @@ static device_method_t npx_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t npx_driver = { diff --git a/sys/platform/pc32/isa/pmtimer.c b/sys/platform/pc32/isa/pmtimer.c index a0654070b9..d1d0ca9b40 100644 --- a/sys/platform/pc32/isa/pmtimer.c +++ b/sys/platform/pc32/isa/pmtimer.c @@ -108,7 +108,7 @@ static device_method_t pmtimer_methods[] = { DEVMETHOD(device_attach, bus_generic_attach), DEVMETHOD(device_suspend, pmtimer_suspend), DEVMETHOD(device_resume, pmtimer_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t pmtimer_driver = { diff --git a/sys/platform/pc64/apm/apm.c b/sys/platform/pc64/apm/apm.c index 0ddc7b0185..005c74f1aa 100644 --- a/sys/platform/pc64/apm/apm.c +++ b/sys/platform/pc64/apm/apm.c @@ -1412,7 +1412,7 @@ static device_method_t apm_methods[] = { DEVMETHOD(device_probe, apm_probe), DEVMETHOD(device_attach, apm_attach), - { 0, 0 } + DEVMETHOD_END }; static driver_t apm_driver = { diff --git a/sys/platform/pc64/isa/pmtimer.c b/sys/platform/pc64/isa/pmtimer.c index c96f2d8f7b..1cfe90f72f 100644 --- a/sys/platform/pc64/isa/pmtimer.c +++ b/sys/platform/pc64/isa/pmtimer.c @@ -109,7 +109,7 @@ static device_method_t pmtimer_methods[] = { DEVMETHOD(device_attach, bus_generic_attach), DEVMETHOD(device_suspend, pmtimer_suspend), DEVMETHOD(device_resume, pmtimer_resume), - { 0, 0 } + DEVMETHOD_END }; static driver_t pmtimer_driver = { diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c index a1fab9ed55..bd974af9f2 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -155,7 +155,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(pcib_release_msix, nexus_release_msix), #endif - { 0, 0 } + DEVMETHOD_END }; static driver_t nexus_driver = { diff --git a/usr.sbin/ndiscvt/windrv_stub.c b/usr.sbin/ndiscvt/windrv_stub.c index cee29b2634..0f0543369a 100644 --- a/usr.sbin/ndiscvt/windrv_stub.c +++ b/usr.sbin/ndiscvt/windrv_stub.c @@ -174,7 +174,7 @@ static device_method_t windrv_methods[] = { /* Device interface */ DEVMETHOD(device_probe, windrv_probe), - { 0, 0 } + DEVMETHOD_END }; static driver_t windrv_driver = { -- 2.41.0