kernel: Use DEVMETHOD_END in the drivers.
authorSascha Wildner <saw@online.de>
Wed, 20 Feb 2013 07:08:39 +0000 (08:08 +0100)
committerSascha Wildner <saw@online.de>
Wed, 20 Feb 2013 07:09:04 +0000 (08:09 +0100)
436 files changed:
sys/bus/firewire/firewire.c
sys/bus/firewire/fwohci_pci.c
sys/bus/iicbus/iic.c
sys/bus/iicbus/iicbb.c
sys/bus/iicbus/iicbus.c
sys/bus/iicbus/iicsmb.c
sys/bus/iicbus/pcf/pcf.c
sys/bus/isa/isa_common.c
sys/bus/isa/isahint.c
sys/bus/isa/pnp.c
sys/bus/isa/pnpeat.c
sys/bus/isa/syscons_isa.c
sys/bus/isa/vga_isa.c
sys/bus/mmc/mmc.c
sys/bus/pccard/pccard.c
sys/bus/pci/fixup_pci.c
sys/bus/pci/hostb_pci.c
sys/bus/pci/i386/legacy.c
sys/bus/pci/i386/mptable_pci.c
sys/bus/pci/i386/pci_bus.c
sys/bus/pci/i386/pci_pir.c
sys/bus/pci/ignore_pci.c
sys/bus/pci/isa_pci.c
sys/bus/pci/pci.c
sys/bus/pci/pci_compat.c
sys/bus/pci/pci_pci.c
sys/bus/pci/vga_pci.c
sys/bus/pci/x86_64/legacy.c
sys/bus/pci/x86_64/mptable_pci.c
sys/bus/pci/x86_64/pci_bus.c
sys/bus/pci/x86_64/pci_pir.c
sys/bus/ppbus/ppbconf.c
sys/bus/smbus/smb.c
sys/bus/smbus/smbus.c
sys/bus/u4b/audio/uaudio.c
sys/bus/u4b/audio/uaudio_pcm.c
sys/bus/u4b/controller/ehci_pci.c
sys/bus/u4b/controller/ohci_pci.c
sys/bus/u4b/controller/uhci_pci.c
sys/bus/u4b/controller/usb_controller.c
sys/bus/u4b/controller/xhci_pci.c
sys/bus/u4b/input/atp.c
sys/bus/u4b/input/uep.c
sys/bus/u4b/input/uhid.c
sys/bus/u4b/input/ukbd.c
sys/bus/u4b/input/ums.c
sys/bus/u4b/misc/udbp.c
sys/bus/u4b/misc/ufm.c
sys/bus/u4b/net/if_axe.c
sys/bus/u4b/net/if_cdce.c
sys/bus/u4b/net/if_cue.c
sys/bus/u4b/net/if_ipheth.c
sys/bus/u4b/net/if_kue.c
sys/bus/u4b/net/if_udav.c
sys/bus/u4b/net/if_usie.c
sys/bus/u4b/net/uhso.c
sys/bus/u4b/serial/u3g.c
sys/bus/u4b/serial/uark.c
sys/bus/u4b/serial/ubsa.c
sys/bus/u4b/serial/ubser.c
sys/bus/u4b/serial/uchcom.c
sys/bus/u4b/serial/ucycom.c
sys/bus/u4b/serial/ufoma.c
sys/bus/u4b/serial/uftdi.c
sys/bus/u4b/serial/ugensa.c
sys/bus/u4b/serial/uipaq.c
sys/bus/u4b/serial/ulpt.c
sys/bus/u4b/serial/umcs.c
sys/bus/u4b/serial/umct.c
sys/bus/u4b/serial/umodem.c
sys/bus/u4b/serial/umoscom.c
sys/bus/u4b/serial/uplcom.c
sys/bus/u4b/serial/uslcom.c
sys/bus/u4b/serial/uvisor.c
sys/bus/u4b/serial/uvscom.c
sys/bus/u4b/storage/umass.c
sys/bus/u4b/storage/urio.c
sys/bus/u4b/storage/ustorage_fs.c
sys/bus/u4b/usb_compat_linux.c
sys/bus/u4b/usb_hub.c
sys/bus/u4b/wlan/if_rum.c
sys/bus/u4b/wlan/if_run.c
sys/bus/u4b/wlan/if_uath.c
sys/bus/u4b/wlan/if_upgt.c
sys/bus/u4b/wlan/if_ural.c
sys/bus/u4b/wlan/if_urtw.c
sys/bus/u4b/wlan/if_zyd.c
sys/bus/usb/ehci_pci.c
sys/bus/usb/ohci_pci.c
sys/bus/usb/uhci_pci.c
sys/bus/usb/uhub.c
sys/bus/usb/usb.c
sys/bus/usb/usb_port.h
sys/dev/acpica/acpi.c
sys/dev/acpica/acpi_acad.c
sys/dev/acpica/acpi_asus/acpi_asus.c
sys/dev/acpica/acpi_button.c
sys/dev/acpica/acpi_cmbat.c
sys/dev/acpica/acpi_cpu.c
sys/dev/acpica/acpi_cpu_cstate.c
sys/dev/acpica/acpi_cpu_pstate.c
sys/dev/acpica/acpi_ec.c
sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c
sys/dev/acpica/acpi_hp/acpi_hp.c
sys/dev/acpica/acpi_hpet.c
sys/dev/acpica/acpi_isab.c
sys/dev/acpica/acpi_lid.c
sys/dev/acpica/acpi_panasonic/acpi_panasonic.c
sys/dev/acpica/acpi_pci.c
sys/dev/acpica/acpi_pci_link.c
sys/dev/acpica/acpi_pcib_acpi.c
sys/dev/acpica/acpi_pcib_pci.c
sys/dev/acpica/acpi_resource.c
sys/dev/acpica/acpi_smbat.c
sys/dev/acpica/acpi_sony/acpi_sony.c
sys/dev/acpica/acpi_thermal.c
sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c
sys/dev/acpica/acpi_timer.c
sys/dev/acpica/acpi_toshiba/acpi_toshiba.c
sys/dev/acpica/acpi_video/acpi_video.c
sys/dev/acpica/acpi_wmi/acpi_wmi.c
sys/dev/agp/agp_ali.c
sys/dev/agp/agp_amd.c
sys/dev/agp/agp_amd64.c
sys/dev/agp/agp_ati.c
sys/dev/agp/agp_i810.c
sys/dev/agp/agp_intel.c
sys/dev/agp/agp_nvidia.c
sys/dev/agp/agp_sis.c
sys/dev/agp/agp_via.c
sys/dev/crypto/aesni/aesni.c
sys/dev/crypto/glxsb/glxsb.c
sys/dev/crypto/hifn/hifn7751.c
sys/dev/crypto/padlock/padlock.c
sys/dev/crypto/rdrand/rdrand.c
sys/dev/crypto/safe/safe.c
sys/dev/crypto/ubsec/ubsec.c
sys/dev/disk/advansys/adv_isa.c
sys/dev/disk/advansys/adv_pci.c
sys/dev/disk/advansys/adw_pci.c
sys/dev/disk/ahci/ahci_dragonfly.c
sys/dev/disk/aic/aic_pccard.c
sys/dev/disk/aic7xxx/ahc_pci.c
sys/dev/disk/aic7xxx/ahd_pci.c
sys/dev/disk/amd/amd.c
sys/dev/disk/buslogic/bt_pci.c
sys/dev/disk/fd/fd.c
sys/dev/disk/fd/fd_pccard.c
sys/dev/disk/isp/isp_pci.c
sys/dev/disk/mmcsd/mmcsd.c
sys/dev/disk/mpt/mpt_pci.c
sys/dev/disk/nata/ata-card.c
sys/dev/disk/nata/ata-disk.c
sys/dev/disk/nata/ata-isa.c
sys/dev/disk/nata/ata-pci.c
sys/dev/disk/nata/ata-raid.c
sys/dev/disk/nata/ata-usb.c
sys/dev/disk/nata/atapi-cam.c
sys/dev/disk/nata/atapi-cd.c
sys/dev/disk/nata/atapi-fd.c
sys/dev/disk/nata/atapi-tape.c
sys/dev/disk/ncr/ncr.c
sys/dev/disk/ncv/ncr53c500_pccard.c
sys/dev/disk/nsp/nsp_pccard.c
sys/dev/disk/sbp/sbp.c
sys/dev/disk/sdhci/sdhci.c
sys/dev/disk/sili/sili_dragonfly.c
sys/dev/disk/stg/tmc18c30_isa.c
sys/dev/disk/stg/tmc18c30_pccard.c
sys/dev/disk/sym/sym_hipd.c
sys/dev/disk/trm/trm.c
sys/dev/disk/vpo/vpo.c
sys/dev/drm/i915/i915_drv.c
sys/dev/drm/mach64/mach64_drv.c
sys/dev/drm/mga/mga_drv.c
sys/dev/drm/r128/r128_drv.c
sys/dev/drm/radeon/radeon_drv.c
sys/dev/drm/savage/savage_drv.c
sys/dev/drm/sis/sis_drv.c
sys/dev/drm/tdfx/tdfx_drv.c
sys/dev/misc/amdsbwd/amdsbwd.c
sys/dev/misc/atkbd/atkbd_isa.c
sys/dev/misc/atkbdc_layer/atkbdc_isa.c
sys/dev/misc/cmx/cmx_pccard.c
sys/dev/misc/dcons/dcons_crom.c
sys/dev/misc/ecc/ecc_amd8000.c
sys/dev/misc/ecc/ecc_e31200.c
sys/dev/misc/ecc/ecc_x3400.c
sys/dev/misc/ichwd/ichwd.c
sys/dev/misc/joy/joy.c
sys/dev/misc/lpbb/lpbb.c
sys/dev/misc/lpt/lpt.c
sys/dev/misc/musycc/musycc.c
sys/dev/misc/nsclpcsio/nsclpcsio_isa.c
sys/dev/misc/orm/orm.c
sys/dev/misc/pcfclock/pcfclock.c
sys/dev/misc/ppc/ppc.c
sys/dev/misc/ppi/ppi.c
sys/dev/misc/pps/pps.c
sys/dev/misc/psm/psm.c
sys/dev/misc/puc/puc.c
sys/dev/misc/spic/spic.c
sys/dev/netif/acx/if_acx.c
sys/dev/netif/an/if_an_isa.c
sys/dev/netif/an/if_an_pccard.c
sys/dev/netif/an/if_an_pci.c
sys/dev/netif/ar/if_ar_isa.c
sys/dev/netif/ar/if_ar_pci.c
sys/dev/netif/ath/ath/if_ath_pci.c
sys/dev/netif/aue/if_aue.c
sys/dev/netif/axe/if_axe.c
sys/dev/netif/bce/if_bce.c
sys/dev/netif/bfe/if_bfe.c
sys/dev/netif/bge/if_bge.c
sys/dev/netif/bnx/if_bnx.c
sys/dev/netif/bwi/if_bwi.c
sys/dev/netif/cs/if_cs_isa.c
sys/dev/netif/cs/if_cs_pccard.c
sys/dev/netif/cue/if_cue.c
sys/dev/netif/dc/if_dc.c
sys/dev/netif/de/if_de.c
sys/dev/netif/ed/if_ed_isa.c
sys/dev/netif/ed/if_ed_pccard.c
sys/dev/netif/ed/if_ed_pci.c
sys/dev/netif/em/if_em.c
sys/dev/netif/emx/if_emx.c
sys/dev/netif/ep/if_ep_isa.c
sys/dev/netif/ep/if_ep_pccard.c
sys/dev/netif/et/if_et.c
sys/dev/netif/ex/if_ex_isa.c
sys/dev/netif/ex/if_ex_pccard.c
sys/dev/netif/fe/if_fe_isa.c
sys/dev/netif/fe/if_fe_pccard.c
sys/dev/netif/fwe/if_fwe.c
sys/dev/netif/fxp/if_fxp.c
sys/dev/netif/ic/if_ic.c
sys/dev/netif/igb/if_igb.c
sys/dev/netif/iwi/if_iwi.c
sys/dev/netif/iwl/if_iwl.c
sys/dev/netif/iwn/if_iwn.c
sys/dev/netif/ixgbe/ixgbe.c
sys/dev/netif/kue/if_kue.c
sys/dev/netif/lge/if_lge.c
sys/dev/netif/lgue/if_lgue.c
sys/dev/netif/lnc/if_lnc_isa.c
sys/dev/netif/lnc/if_lnc_pci.c
sys/dev/netif/mii_layer/acphy.c
sys/dev/netif/mii_layer/amphy.c
sys/dev/netif/mii_layer/atphy.c
sys/dev/netif/mii_layer/brgphy.c
sys/dev/netif/mii_layer/ciphy.c
sys/dev/netif/mii_layer/dcphy.c
sys/dev/netif/mii_layer/e1000phy.c
sys/dev/netif/mii_layer/exphy.c
sys/dev/netif/mii_layer/inphy.c
sys/dev/netif/mii_layer/ip1000phy.c
sys/dev/netif/mii_layer/lxtphy.c
sys/dev/netif/mii_layer/mii.c
sys/dev/netif/mii_layer/mlphy.c
sys/dev/netif/mii_layer/nsgphy.c
sys/dev/netif/mii_layer/nsphy.c
sys/dev/netif/mii_layer/pnaphy.c
sys/dev/netif/mii_layer/pnphy.c
sys/dev/netif/mii_layer/qsphy.c
sys/dev/netif/mii_layer/rgephy.c
sys/dev/netif/mii_layer/rlphy.c
sys/dev/netif/mii_layer/ruephy.c
sys/dev/netif/mii_layer/tlphy.c
sys/dev/netif/mii_layer/truephy.c
sys/dev/netif/mii_layer/ukphy.c
sys/dev/netif/mii_layer/xmphy.c
sys/dev/netif/mn/if_mn.c
sys/dev/netif/mxge/if_mxge.c
sys/dev/netif/my/if_my.c
sys/dev/netif/ndis/if_ndis_pccard.c
sys/dev/netif/ndis/if_ndis_pci.c
sys/dev/netif/ndis/if_ndis_u4b.c
sys/dev/netif/ndis/if_ndis_usb.c
sys/dev/netif/nfe/if_nfe.c
sys/dev/netif/nge/if_nge.c
sys/dev/netif/pcn/if_pcn.c
sys/dev/netif/plip/if_plip.c
sys/dev/netif/ral/if_ral_pci.c
sys/dev/netif/re/if_re.c
sys/dev/netif/rl/if_rl.c
sys/dev/netif/rtw/if_rtw_pci.c
sys/dev/netif/rue/if_rue.c
sys/dev/netif/rum/if_rum.c
sys/dev/netif/sbni/if_sbni_pci.c
sys/dev/netif/sbsh/if_sbsh.c
sys/dev/netif/sf/if_sf.c
sys/dev/netif/sis/if_sis.c
sys/dev/netif/sk/if_sk.c
sys/dev/netif/sln/if_sln.c
sys/dev/netif/sn/if_sn_isa.c
sys/dev/netif/sn/if_sn_pccard.c
sys/dev/netif/sr/if_sr_pci.c
sys/dev/netif/ste/if_ste.c
sys/dev/netif/stge/if_stge.c
sys/dev/netif/ti/if_ti.c
sys/dev/netif/tl/if_tl.c
sys/dev/netif/tx/if_tx.c
sys/dev/netif/txp/if_txp.c
sys/dev/netif/ural/if_ural.c
sys/dev/netif/vge/if_vge.c
sys/dev/netif/vr/if_vr.c
sys/dev/netif/vx/if_vx_pci.c
sys/dev/netif/wb/if_wb.c
sys/dev/netif/wi/if_wi_pccard.c
sys/dev/netif/wi/if_wi_pci.c
sys/dev/netif/wpi/if_wpi.c
sys/dev/netif/xe/if_xe_pccard.c
sys/dev/netif/xl/if_xl.c
sys/dev/pccard/cardbus/cardbus.c
sys/dev/pccard/pccbb/pccbb_isa.c
sys/dev/pccard/pccbb/pccbb_pci.c
sys/dev/powermng/alpm/alpm.c
sys/dev/powermng/amdpm/amdpm.c
sys/dev/powermng/amdsmb/amdsmb.c
sys/dev/powermng/coretemp/coretemp.c
sys/dev/powermng/ichsmb/ichsmb_pci.c
sys/dev/powermng/intpm/intpm.c
sys/dev/powermng/it/it.c
sys/dev/powermng/lm/lm78_isa.c
sys/dev/powermng/viapm/viapm.c
sys/dev/raid/aac/aac_cam.c
sys/dev/raid/aac/aac_disk.c
sys/dev/raid/aac/aac_pci.c
sys/dev/raid/amr/amr_cam.c
sys/dev/raid/amr/amr_disk.c
sys/dev/raid/amr/amr_pci.c
sys/dev/raid/arcmsr/arcmsr.c
sys/dev/raid/asr/asr.c
sys/dev/raid/ciss/ciss.c
sys/dev/raid/dpt/dpt_pci.c
sys/dev/raid/hpt27xx/osm_bsd.c
sys/dev/raid/hptiop/hptiop.c
sys/dev/raid/hptmv/entry.c
sys/dev/raid/hptrr/hptrr_osm_bsd.c
sys/dev/raid/ida/ida_disk.c
sys/dev/raid/ida/ida_pci.c
sys/dev/raid/iir/iir_pci.c
sys/dev/raid/ips/ips_disk.c
sys/dev/raid/ips/ips_pci.c
sys/dev/raid/mfi/mfi_cam.c
sys/dev/raid/mfi/mfi_disk.c
sys/dev/raid/mfi/mfi_pci.c
sys/dev/raid/mfi/mfi_syspd.c
sys/dev/raid/mlx/mlx_disk.c
sys/dev/raid/mlx/mlx_pci.c
sys/dev/raid/mly/mly.c
sys/dev/raid/mps/mps_pci.c
sys/dev/raid/pst/pst-pci.c
sys/dev/raid/pst/pst-raid.c
sys/dev/raid/twa/tw_osl_freebsd.c
sys/dev/raid/twe/twe_freebsd.c
sys/dev/raid/tws/tws.c
sys/dev/serial/digi/digi_isa.c
sys/dev/serial/digi/digi_pci.c
sys/dev/serial/rp/rp_isa.c
sys/dev/serial/rp/rp_pci.c
sys/dev/serial/si/si_isa.c
sys/dev/serial/si/si_pci.c
sys/dev/serial/sio/sio.c
sys/dev/serial/sio/sio_pccard.c
sys/dev/sound/pci/als4000.c
sys/dev/sound/pci/atiixp.c
sys/dev/sound/pci/au88x0.c
sys/dev/sound/pci/aureal.c
sys/dev/sound/pci/cmi.c
sys/dev/sound/pci/cs4281.c
sys/dev/sound/pci/csa.c
sys/dev/sound/pci/csapcm.c
sys/dev/sound/pci/ds1.c
sys/dev/sound/pci/emu10k1.c
sys/dev/sound/pci/envy24.c
sys/dev/sound/pci/envy24ht.c
sys/dev/sound/pci/es137x.c
sys/dev/sound/pci/fm801.c
sys/dev/sound/pci/hda/hdac.c
sys/dev/sound/pci/ich.c
sys/dev/sound/pci/maestro.c
sys/dev/sound/pci/maestro3.c
sys/dev/sound/pci/neomagic.c
sys/dev/sound/pci/solo.c
sys/dev/sound/pci/t4dwave.c
sys/dev/sound/pci/via8233.c
sys/dev/sound/pci/via82c686.c
sys/dev/sound/pci/vibes.c
sys/dev/sound/usb/uaudio.c
sys/dev/sound/usb/uaudio_pcm.c
sys/dev/usbmisc/moscom/moscom.c
sys/dev/usbmisc/uark/uark.c
sys/dev/usbmisc/ubsa/ubsa.c
sys/dev/usbmisc/ubt/ubt.c
sys/dev/usbmisc/uchcom/uchcom.c
sys/dev/usbmisc/ufm/ufm.c
sys/dev/usbmisc/uftdi/uftdi.c
sys/dev/usbmisc/ugen/ugen.c
sys/dev/usbmisc/ugensa/ugensa.c
sys/dev/usbmisc/uhid/uhid.c
sys/dev/usbmisc/ukbd/ukbd.c
sys/dev/usbmisc/ulpt/ulpt.c
sys/dev/usbmisc/umass/umass.c
sys/dev/usbmisc/umct/umct.c
sys/dev/usbmisc/umodem/umodem.c
sys/dev/usbmisc/ums/ums.c
sys/dev/usbmisc/uplcom/uplcom.c
sys/dev/usbmisc/urio/urio.c
sys/dev/usbmisc/uscanner/uscanner.c
sys/dev/usbmisc/uslcom/uslcom.c
sys/dev/usbmisc/uticom/uticom.c
sys/dev/usbmisc/uvisor/uvisor.c
sys/dev/usbmisc/uvscom/uvscom.c
sys/dev/video/bktr/bktr_os.c
sys/dev/video/cxm/cxm.c
sys/dev/video/cxm/cxm_i2c.c
sys/dev/video/fb/fb.c
sys/dev/virtual/virtio/block/virtio_blk.c
sys/dev/virtual/virtio/pci/virtio_pci.c
sys/netgraph7/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
sys/netgraph7/bluetooth/drivers/ubt/ng_ubt.c
sys/netgraph7/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
sys/opencrypto/cryptosoft.c
sys/platform/pc32/apm/apm.c
sys/platform/pc32/i386/cs5536.c
sys/platform/pc32/i386/geode.c
sys/platform/pc32/i386/mp_clock.c
sys/platform/pc32/i386/nexus.c
sys/platform/pc32/i386/pnpbios.c
sys/platform/pc32/isa/npx.c
sys/platform/pc32/isa/pmtimer.c
sys/platform/pc64/apm/apm.c
sys/platform/pc64/isa/pmtimer.c
sys/platform/pc64/x86_64/nexus.c
usr.sbin/ndiscvt/windrv_stub.c

index 3911fff..81139fa 100644 (file)
@@ -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",
index 1016a1a..4da47c2 100644 (file)
@@ -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 = {
index 90ca545..c15a5cd 100644 (file)
@@ -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 = {
index 3de7a5e..d43e18a 100644 (file)
@@ -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 = {
index 33b16de..a9c1a97 100644 (file)
@@ -69,7 +69,7 @@ static device_method_t iicbus_methods[] = {
 
        DEVMETHOD(iicbus_transfer,      iicbus_transfer_gen),
 
-        { 0, 0 }
+        DEVMETHOD_END
 };
 
 driver_t iicbus_driver = {
index 40793a6..8d2d5dc 100644 (file)
@@ -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 = {
index 5166133..888382e 100644 (file)
@@ -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 = {
index 83d6926..f2a349b 100644 (file)
@@ -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 = {
index 11f6dcd..7f69f17 100644 (file)
@@ -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 = {
index e7a1844..b8b3cce 100644 (file)
@@ -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 = {
index 80e01f9..1f63bc4 100644 (file)
@@ -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 = {
index 167b9df..216d948 100644 (file)
@@ -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 = {
index cf07860..f72e2a4 100644 (file)
@@ -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 = {
index b90903f..3365a63 100644 (file)
@@ -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 = {
index 26c986d..c4d4e5b 100644 (file)
@@ -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 = {
index 53c40bf..dc83ff2 100644 (file)
@@ -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 = {
index e9e7541..522ba2a 100644 (file)
@@ -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 = {
index 2f71a53..c866d11 100644 (file)
@@ -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 = {
index cb69391..df11d4d 100644 (file)
@@ -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;
index 45714ea..f4b183c 100644 (file)
@@ -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;
index 225ce99..02b5806 100644 (file)
@@ -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 = {
index a733b26..72297e9 100644 (file)
@@ -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 = {
index 2ad55d1..5400a0c 100644 (file)
@@ -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 = {
index d3cd7aa..dd9c7e7 100644 (file)
@@ -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);
index a471292..87011d9 100644 (file)
@@ -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
 };
 
 /*
index c6d6a48..91f1d73 100644 (file)
@@ -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;
index 33a7cec..94f6c57 100644 (file)
@@ -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 = {
index 2f71a53..c866d11 100644 (file)
@@ -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 = {
index cb69391..df11d4d 100644 (file)
@@ -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;
index 0170de4..70d84ac 100644 (file)
@@ -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;
index 225ce99..02b5806 100644 (file)
@@ -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 = {
index b6b8991..9144257 100644 (file)
@@ -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 = {
index 7941c58..f711ab9 100644 (file)
@@ -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 = {
index 1e2d6fa..828a8b9 100644 (file)
@@ -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 <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -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 = {
index 16f9bbf..aaf8daf 100644 (file)
@@ -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 = {
index 068efb6..97a18cc 100644 (file)
@@ -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 = {
index a732cb4..2fe8688 100644 (file)
@@ -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 = {
index bdbabae..8ad83cd 100644 (file)
@@ -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 = {
index 4ca4fc8..0216a41 100644 (file)
@@ -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 = {
index 8b0e92e..183eff3 100644 (file)
@@ -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 = {
index e936567..408afbd 100644 (file)
@@ -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 = {
index 6cfba78..0a32026 100644 (file)
@@ -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 = {
index f475747..6df76ae 100644 (file)
@@ -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 = {
index 71f28a8..1c8cfd3 100644 (file)
@@ -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 = {
index 92070a9..4f4aa54 100644 (file)
@@ -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 = {
index a1db6c8..04b4895 100644 (file)
@@ -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 = {
index c55edf2..ccc5549 100644 (file)
@@ -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 = {
index 11bea65..500c343 100644 (file)
@@ -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 = {
index 47d2b17..5f8fae5 100644 (file)
@@ -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 = {
index eabf9c6..c0fa2cb 100644 (file)
@@ -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 = {
index 7466ba9..b72444e 100644 (file)
@@ -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 = {
index ad4b6f1..39049eb 100644 (file)
@@ -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 = {
index 2d3fc42..b7f3747 100644 (file)
@@ -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 = {
index 7acb9dc..09ce813 100644 (file)
@@ -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 = {
index f920128..ffbe0c3 100644 (file)
@@ -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 = {
index 2c77840..9286085 100644 (file)
@@ -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 = {
index 24c4a3e..f36084b 100644 (file)
@@ -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;
index 575d966..86b397e 100644 (file)
@@ -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;
index 3733f61..5839ae7 100644 (file)
@@ -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;
index 1a3e74d..14f131c 100644 (file)
@@ -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;
index 2164959..00d000e 100644 (file)
@@ -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 = {
index 8ea493e..973484e 100644 (file)
@@ -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;
index 2d67cab..5398d98 100644 (file)
@@ -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;
index a73a978..07e1e03 100644 (file)
@@ -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;
index 96bbf8c..dd6f943 100644 (file)
@@ -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;
index 2569d13..6144983 100644 (file)
@@ -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;
index 092b548..4e3535a 100644 (file)
@@ -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 = {
index c50006e..70d2a99 100644 (file)
@@ -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;
index a98c864..5b31645 100644 (file)
@@ -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;
index f37702b..2587164 100644 (file)
@@ -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;
index e023444..8e07ecb 100644 (file)
@@ -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;
index e2052c9..efde7f8 100644 (file)
@@ -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;
index c920eb8..aa26666 100644 (file)
@@ -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;
index 9299692..4074c63 100644 (file)
@@ -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;
index 4084529..62f201c 100644 (file)
@@ -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;
index deb09c4..34a63ae 100644 (file)
@@ -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 = {
index e79ae87..435a69d 100644 (file)
@@ -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 = {
index 63face4..f55a8d0 100644 (file)
@@ -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 = {
index 2bdf4dc..376f9c9 100644 (file)
@@ -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 = {
index 872fe12..014f2a1 100644 (file)
@@ -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 = {
index 0e6883e..e3255fb 100644 (file)
@@ -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 = {
index 3e7563e..b978470 100644 (file)
@@ -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 = {
index 0e52951..39b01eb 100644 (file)
@@ -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",
index 12e0f89..e61e3df 100644 (file)
@@ -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 = {
index d48c07c..7152eec 100644 (file)
@@ -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 = {
index c7eec2e..73e7396 100644 (file)
@@ -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",
index c8679d6..c663646 100644 (file)
@@ -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 = {
index 8779892..0214909 100644 (file)
@@ -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 = {
index bb93c57..b99c09d 100644 (file)
@@ -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 = {
index 9b48a7c..6a4892a 100644 (file)
@@ -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 = {
index c7b6322..8d56d8d 100644 (file)
@@ -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 = {
index 49b0530..6737075 100644 (file)
@@ -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 = {
index 0a133e6..cda408c 100644 (file)
@@ -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) = { \
index 0ce2b3f..1aab9d1 100644 (file)
@@ -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 = {
index d228075..168284e 100644 (file)
@@ -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 = {
index a64ad0a..bc63088 100644 (file)
@@ -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 = {
index 2d23554..0bda461 100644 (file)
@@ -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 = {
index 168b23a..22038c9 100644 (file)
@@ -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 = {
index 093bf1a..de7db65 100644 (file)
@@ -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 = {
index f70c2c5..0364001 100644 (file)
@@ -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 = {
index 6410b88..aa0e588 100644 (file)
@@ -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 = {
index aeab9e7..e49611d 100644 (file)
@@ -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 = {
index 5c28085..4dc4c71 100644 (file)
@@ -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 = {
index c6a8675..8c45446 100644 (file)
@@ -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 = {
index 035e6ef..8c26f52 100644 (file)
@@ -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 = {
index fd48198..d1f90bc 100644 (file)
@@ -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 = {
index 552445c..a29114c 100644 (file)
@@ -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 = {
index 7853323..82b2ad7 100644 (file)
@@ -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 = {
index 0ea5579..f32fc08 100644 (file)
@@ -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;
index 83235c2..e55a0f8 100644 (file)
@@ -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 = {
index 3935586..359c526 100644 (file)
@@ -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;
index f15f262..048416e 100644 (file)
@@ -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;
index 2283c53..bbfd499 100644 (file)
@@ -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 = {
index f2fb5d4..dc2282f 100644 (file)
@@ -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 = {
index 165184f..8438c8b 100644 (file)
@@ -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 = {
index ef64c8b..909e837 100644 (file)
@@ -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 = {
index b84ccba..56d4abe 100644 (file)
@@ -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 = {
index 2cfe6b8..37ba2c2 100644 (file)
@@ -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 = {
index b4832f8..6e1d88a 100644 (file)
@@ -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 = {
index 298a25f..2b1cc8e 100644 (file)
@@ -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 = {
index 8607065..196a64d 100644 (file)
@@ -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 = {
index 8f6aa71..a1ab36a 100644 (file)
@@ -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 = {
index fb82606..6afe985 100644 (file)
@@ -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 = {
index 2b640bd..b9e798d 100644 (file)
@@ -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 = {
index c4238b0..a3b13a2 100644 (file)
@@ -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 = {
index 7f66165..8062092 100644 (file)
@@ -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 = {
index d290055..39b6906 100644 (file)
@@ -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 = {
index 4bc1be8..f0ecce8 100644 (file)
@@ -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 = {
index 263eaeb..04b2ab4 100644 (file)
@@ -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 = {
index 9a2bd82..eb58581 100644 (file)
@@ -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 = {
index 4db1184..a4919d5 100644 (file)
@@ -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 = {
index 651bed8..80db5ec 100644 (file)
@@ -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 = {
index 71984c5..b3adf47 100644 (file)
@@ -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",
index 426864e..96e663e 100644 (file)
@@ -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 = {
index d0c1e75..d828536 100644 (file)
@@ -139,7 +139,7 @@ static device_method_t rdrand_methods[] = {
        DEVMETHOD(device_attach, rdrand_attach),
        DEVMETHOD(device_detach, rdrand_detach),
 
-       {0, 0},
+       DEVMETHOD_END
 };
 
 
index af89e18..648c7dd 100644 (file)
@@ -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",
index ce5e558..e711c80 100644 (file)
@@ -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",
index 9d5715c..a960a40 100644 (file)
@@ -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 = {
index d2f5920..20a9057 100644 (file)
@@ -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 = {
index 71728d9..3fa0f73 100644 (file)
@@ -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 = {
index 0ecc69f..d320f5b 100644 (file)
@@ -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;
index 0c9032d..ac41d13 100644 (file)
@@ -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 = {
index 8a3d76d..2c10b33 100644 (file)
@@ -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 = {
index 2e452da..76e99c5 100644 (file)
@@ -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 = {
index 15f4895..4944b0c 100644 (file)
@@ -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 = {
index b6e5bd0..664466f 100644 (file)
@@ -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 = {
index 507c56e..5b50162 100644 (file)
@@ -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 = {
index 82e4f08..d4e96e4 100644 (file)
@@ -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 = {
index 3ec9eef..a9e594e 100644 (file)
@@ -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 = {
index 4b7cea1..bd29cc8 100644 (file)
@@ -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 = {
index fe123eb..24fe9d9 100644 (file)
@@ -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 = {
index 11db71f..68881c8 100644 (file)
@@ -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 = {
index fe48d3e..23ad52d 100644 (file)
@@ -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 = {
index 0f1a8d0..91cea68 100644 (file)
@@ -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 = {
index 2d79536..60edaf3 100644 (file)
@@ -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 = {
index 1b3a96a..cb3b9f3 100644 (file)
@@ -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 = {
index 186a20c..008e11d 100644 (file)
@@ -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 = {
index 7a548aa..8fadcfa 100644 (file)
@@ -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 = {
index ed8a7f8..dc05419 100644 (file)
@@ -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 = {
index 2f11753..29672a3 100644 (file)
@@ -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 <sys/param.h>
@@ -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 = {
index 614f1ce..5d334f2 100644 (file)
@@ -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 = {
index 338bbc4..2a5b888 100644 (file)
@@ -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 = {
index 7a27c3b..2e2c8ab 100644 (file)
@@ -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 = {
index d9f31ad..111673f 100644 (file)
@@ -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 = {
index a6d792b..659a708 100644 (file)
@@ -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 = {
index 3deea9d..73ac442 100644 (file)
@@ -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 = {
index c0c74fb..c2caac0 100644 (file)
@@ -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;
index 4879c5b..8de647c 100644 (file)
@@ -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 = {
index deff76f..c8bc375 100644 (file)
@@ -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 = {
index 1b11a49..6c2925c 100644 (file)
@@ -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 = {
index e23f7be..5dbcce6 100644 (file)
@@ -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 = {
index da01e70..2eeab11 100644 (file)
@@ -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 = {
index fbf35f6..3620e3f 100644 (file)
@@ -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 = {
index efbff3f..288c2e5 100644 (file)
@@ -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 = {
index 1f965a4..d93f5fc 100644 (file)
@@ -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 = {
index 864f0ec..cec6eb7 100644 (file)
@@ -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 = {
index 892973c..79a5706 100644 (file)
@@ -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 = {
index e8df7c8..47e8aa7 100644 (file)
@@ -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 = {
index 39198f4..67e5f1c 100644 (file)
@@ -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 = {
index 3c8bb42..b215d10 100644 (file)
@@ -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 = {
index 3de3e56..1d49998 100644 (file)
@@ -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;
index afede14..56273bf 100644 (file)
@@ -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 = {
index 5b42626..fa17759 100644 (file)
@@ -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 = {
index 0b7a196..8469457 100644 (file)
@@ -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 = {
index 6d8ac45..b64b4b2 100644 (file)
@@ -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 <sys/param.h>
@@ -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 = {
index 35278c1..f8acf3f 100644 (file)
@@ -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 = {
index 27149bc..3a71ba7 100644 (file)
@@ -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 = {
index 268fdfa..9b00080 100644 (file)
@@ -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 = {
index d99830f..c415854 100644 (file)
@@ -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 = {
index ff98c6d..faf9603 100644 (file)
@@ -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 = {
index e2af9bd..3d2b9cc 100644 (file)
@@ -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 = {
index 4cba5df..e969ed2 100644 (file)
@@ -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 = {
index edff3ad..a49e593 100644 (file)
@@ -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 = {
index 0f6fa73..980730f 100644 (file)
@@ -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 = {
index 3edb442..12e07ee 100644 (file)
@@ -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 = {
index a1acc93..5d7d28f 100644 (file)
@@ -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 = {
index 0ac5fc0..bc831b1 100644 (file)
@@ -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 = {
index 87283e5..6c0c5cd 100644 (file)
@@ -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 = {
index 7233b3f..065a425 100644 (file)
@@ -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 = {
index bc85b86..90d3a3e 100644 (file)
@@ -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 = {
index b7d98c9..7fd222f 100644 (file)
@@ -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 = {
index 5c9488e..142e563 100644 (file)
@@ -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 = {
index f4ec703..e577dcc 100644 (file)
@@ -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 = {
index 5675b68..ca2ed34 100644 (file)
@@ -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 = {
index 9ece839..c78f740 100644 (file)
@@ -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 = {
index af637b2..004c47f 100644 (file)
@@ -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 = {
index 24e68f5..0f00702 100644 (file)
@@ -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 = {
index 12ec94e..6ac3cf0 100644 (file)
@@ -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 = {
index e168c57..7956e17 100644 (file)
@@ -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",
index 57e9b70..26cff5f 100644 (file)
@@ -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 = {
index 39be2b0..dc84464 100644 (file)
@@ -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 = {
index 3673db8..a7c109d 100644 (file)
@@ -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 = {
index 34317f4..2b41283 100644 (file)
@@ -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 = {
index c89b602..c7afa82 100644 (file)
@@ -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));
index dca4428..4768f44 100644 (file)
@@ -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));
index 5a6b7b3..8e0aca9 100644 (file)
@@ -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 = {
index 804d583..08538e7 100644 (file)
@@ -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 = {
index 1c48ce9..febde19 100644 (file)
@@ -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 = {
index 8e9475f..dca44ae 100644 (file)
@@ -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 = {
index 231e8d1..313d8de 100644 (file)
@@ -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 = {
index 0b571f0..4d989b5 100644 (file)
@@ -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",
index e8b7687..4ae2bf2 100644 (file)
@@ -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 = {
index 6ac9611..a807b90 100644 (file)
@@ -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 = {
index fbc0b80..099b7bf 100644 (file)
@@ -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 = {
index 7cfc01d..41b7c60 100644 (file)
@@ -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 = {
index 5d52e0c..c1c1e21 100644 (file)
@@ -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 = {
index b17549f..6068b9f 100644 (file)
@@ -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 = {
index a20d90e..4b8a3ee 100644 (file)
@@ -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 = {
index 119d62c..9dd9bcb 100644 (file)
@@ -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 = {
index e8e8d35..41fa841 100644 (file)
@@ -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 = {
index 902510f..68ba9d6 100644 (file)
@@ -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 = {
index e2c9774..5a9b550 100644 (file)
@@ -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 = {
index 44be02e..05df495 100644 (file)
@@ -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 = {
index d2c15c0..927a5a8 100644 (file)
@@ -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 = {
index b6a7450..97bb0fd 100644 (file)
@@ -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 = {
index 84dfd71..2f4b02b 100644 (file)
@@ -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 = {
index af19a95..9f7ffdd 100644 (file)
@@ -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 = {
index 53157c5..ca5aa79 100644 (file)
@@ -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 = {
index eb8ee82..8e0882a 100644 (file)
@@ -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 = {
index 561c543..2f70db4 100644 (file)
@@ -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 = {
index 1c2aaeb..3352f81 100644 (file)
@@ -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 = {
index 1fc0346..5e532c9 100644 (file)
@@ -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 = {
index 35e783f..91e7908 100644 (file)
@@ -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));
index ce4c989..52f3bf4 100644 (file)
@@ -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 = {
index a3f99c1..495e627 100644 (file)
@@ -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));
index 9b3cc68..28dddaa 100644 (file)
@@ -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));
index ab53f05..1da8ade 100644 (file)
@@ -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[] = {
index 088191e..b750391 100644 (file)
@@ -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[] = {
index fea8da4..0987d31 100644 (file)
@@ -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[] = {
index 3e6ed14..5358553 100644 (file)
@@ -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;
index e623235..2b48d02 100644 (file)
@@ -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[] = {
index 290deab..5540426 100644 (file)
@@ -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;
index 6b14045..b858239 100644 (file)
@@ -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[] = {
index b66c0be..978cdb5 100644 (file)
@@ -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;
index 214026e..27867da 100644 (file)
@@ -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[] = {
index ed99d05..aa5866a 100644 (file)
@@ -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;
index 4cf762e..7ce1931 100644 (file)
@@ -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[] = {
index 5410c45..2922109 100644 (file)
@@ -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;
index 0ad3c86..ba9d7c9 100644 (file)
@@ -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;
index a8a4403..017f5bf 100644 (file)
@@ -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[] = {
index 9f09569..2d7a8b2 100644 (file)
@@ -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[] = {
index e33342d..2a429db 100644 (file)
@@ -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[] = {
index d5a8648..c1f093b 100644 (file)
@@ -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;
index 878714f..007f93a 100644 (file)
@@ -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[] = {
index d48f050..f2dc2ef 100644 (file)
@@ -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[] = {
index df088a9..0a8fde8 100644 (file)
@@ -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[] = {
index 7ef0a80..b27bc9d 100644 (file)
@@ -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;
index 57dfe9b..17c4e60 100644 (file)
@@ -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[] = {
index bbc912c..b798e60 100644 (file)
@@ -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[] = {
index f7b5949..5b795eb 100644 (file)
@@ -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;
index 88f602f..5dc3b77 100644 (file)
@@ -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[] = {
index 7c3c0da..8fa1def 100644 (file)
@@ -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 = {
index 50b2db9..a94a3fc 100644 (file)
@@ -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 =
index 6047cb4..99b427a 100644 (file)
@@ -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 = {
index a7ca780..f2c9e5f 100644 (file)
@@ -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 = {
index e6c6d04..7f243f9 100644 (file)
@@ -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 = {
index b9c4845..b627ce4 100644 (file)
@@ -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 = {
index ed3f4e9..5dccea1 100644 (file)
@@ -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 = {
index 2f9735a..45a10f8 100644 (file)
@@ -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 = {
index e26f769..27eab66 100644 (file)
@@ -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));
index 3bd01b5..04b9fa3 100644 (file)
@@ -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 = {
index 3acb4a5..52d2fe5 100644 (file)
@@ -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 = {
index e40293b..8fa405d 100644 (file)
@@ -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 = {
index d9872b2..ed3709f 100644 (file)
@@ -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 = {
index 5e5e226..251042c 100644 (file)
@@ -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));
index 27e2a89..862e5c9 100644 (file)
@@ -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 = {
index f4c2752..64413ca 100644 (file)
@@ -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 = {
index b81aeab..b8091fa 100644 (file)
@@ -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 = {
index fa8d129..8f08f81 100644 (file)
@@ -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 = {
index d603bd7..55b9cbb 100644 (file)
@@ -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 = {
index 5ee350f..617f82f 100644 (file)
@@ -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 = {
index 0820896..6011cfc 100644 (file)
@@ -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 = {
index 03343f2..b173f3b 100644 (file)
@@ -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));
index a817f19..a87ab01 100644 (file)
@@ -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 = {
index c08f2b8..8bfb9bc 100644 (file)
@@ -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 = {
index 74e1db3..6a3306d 100644 (file)
@@ -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 = {
index 5f46516..3e2fbe8 100644 (file)
@@ -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 = {
index 557858d..2408716 100644 (file)
@@ -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 = {
index 1e16ce6..9888047 100644 (file)
@@ -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
 
 };
 
index 701a41c..74ac9d6 100644 (file)
@@ -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
 };
 
 
index 185aa2f..ff66f22 100644 (file)
@@ -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 = {
index f97a928..cfc6e37 100644 (file)
@@ -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 = {
index aac945f..b4d6953 100644 (file)
@@ -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 = {
index 1bae0e8..c5d1162 100644 (file)
@@ -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 = {
index 38eca8f..d1bfc98 100644 (file)
@@ -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 = {
index b32e747..4552013 100644 (file)
@@ -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 = {
index c363d06..c41a4d6 100644 (file)
@@ -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 = {
index 2515ad7..1a1ff35 100644 (file)
@@ -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));
index 6d9d3e4..adbd04f 100644 (file)
@@ -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 = {
index 73fe241..1a416c7 100644 (file)
@@ -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 = {
index e98e908..edb2373 100644 (file)
@@ -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 = {
index f03ed57..03af359 100644 (file)
@@ -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 = {
index 39e26e7..17674b8 100644 (file)
@@ -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 = {
index 3b2d634..65cbf21 100644 (file)
@@ -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);
index 5e2ebc4..abbee4e 100644 (file)
@@ -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 = {
index 97d7e0e..d3ed0dc 100644 (file)
@@ -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 = {
index fd7d07e..fadf44d 100644 (file)
@@ -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 = {
index 29c96ae..88b0afc 100644 (file)
@@ -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 = {
index 72620cf..c3db97d 100644 (file)
@@ -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;
index 7de3b74..f0a2c00 100644 (file)
@@ -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 = {
index 0fa6415..ec4c0e3 100644 (file)
@@ -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 = {
index fb1a561..93517d9 100644 (file)
@@ -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 = {
index 76c1b1a..bb7a91c 100644 (file)
@@ -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 = {
index 47f25e6..bef6c2c 100644 (file)
@@ -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 = {
index b673d8b..e0fd7ec 100644 (file)
@@ -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 = {
index f5de5a9..926e43d 100644 (file)
@@ -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 = {
index e920887..f5f39e6 100644 (file)
@@ -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 = {
index 1855651..39c70e4 100644 (file)
@@ -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 {