svn commit: r246128 - in head/sys/dev: acpi_support acpica adlink amdsbwd amdtemp auxio ce cfi coretemp cp cpufreq ctau cx digi e1000 ep fdc iicbus ixgb ixgbe mfi mn mxge my nvram2env nxge oce sdhc...

Sofian Brabez sbz at FreeBSD.org
Wed Jan 30 18:05:42 UTC 2013


On Wed, Jan 30, 2013 at 06:01:20PM +0000, Sofian Brabez wrote:
> Author: sbz (ports committer)
> Date: Wed Jan 30 18:01:20 2013
> New Revision: 246128
> URL: http://svnweb.freebsd.org/changeset/base/246128
> 
> Log:
>   Use DEVMETHOD_END macro defined in sys/bus.h instead of {0, 0} sentinel on device_method_t arrays
>   
>   Reviewed by:	cognet
>   Approved by:	cognet
> 
> Modified:
>   head/sys/dev/acpi_support/acpi_asus_wmi.c
>   head/sys/dev/acpi_support/acpi_fujitsu.c   (contents, props changed)
>   head/sys/dev/acpi_support/acpi_hp.c
>   head/sys/dev/acpi_support/acpi_ibm.c   (contents, props changed)
>   head/sys/dev/acpi_support/acpi_panasonic.c   (contents, props changed)
>   head/sys/dev/acpi_support/acpi_sony.c   (contents, props changed)
>   head/sys/dev/acpi_support/acpi_toshiba.c   (contents, props changed)
>   head/sys/dev/acpica/acpi.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_acad.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_button.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_cmbat.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_dock.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_ec.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_hpet.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_lid.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_pci.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_pci_link.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_pcib_pci.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_perf.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_resource.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_smbat.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_thermal.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_throttle.c   (contents, props changed)
>   head/sys/dev/acpica/acpi_timer.c   (contents, props changed)
>   head/sys/dev/adlink/adlink.c   (contents, props changed)
>   head/sys/dev/amdsbwd/amdsbwd.c
>   head/sys/dev/amdtemp/amdtemp.c   (contents, props changed)
>   head/sys/dev/auxio/auxio.c   (contents, props changed)
>   head/sys/dev/ce/if_ce.c   (contents, props changed)
>   head/sys/dev/cfi/cfi_bus_fdt.c
>   head/sys/dev/cfi/cfi_bus_ixp4xx.c
>   head/sys/dev/coretemp/coretemp.c   (contents, props changed)
>   head/sys/dev/cp/if_cp.c   (contents, props changed)
>   head/sys/dev/cpufreq/ichss.c   (contents, props changed)
>   head/sys/dev/ctau/if_ct.c   (contents, props changed)
>   head/sys/dev/cx/if_cx.c   (contents, props changed)
>   head/sys/dev/digi/digi_isa.c   (contents, props changed)
>   head/sys/dev/digi/digi_pci.c   (contents, props changed)
>   head/sys/dev/e1000/if_em.c   (contents, props changed)
>   head/sys/dev/e1000/if_igb.c   (contents, props changed)
>   head/sys/dev/e1000/if_lem.c
>   head/sys/dev/ep/if_ep_eisa.c   (contents, props changed)
>   head/sys/dev/ep/if_ep_isa.c   (contents, props changed)
>   head/sys/dev/ep/if_ep_mca.c   (contents, props changed)
>   head/sys/dev/ep/if_ep_pccard.c   (contents, props changed)
>   head/sys/dev/fdc/fdc_acpi.c   (contents, props changed)
>   head/sys/dev/iicbus/ad7418.c   (contents, props changed)
>   head/sys/dev/iicbus/ds133x.c   (contents, props changed)
>   head/sys/dev/iicbus/ds1672.c   (contents, props changed)
>   head/sys/dev/iicbus/icee.c   (contents, props changed)
>   head/sys/dev/ixgb/if_ixgb.c   (contents, props changed)
>   head/sys/dev/ixgbe/ixgbe.c   (contents, props changed)
>   head/sys/dev/ixgbe/ixv.c
>   head/sys/dev/mfi/mfi_cam.c   (contents, props changed)
>   head/sys/dev/mn/if_mn.c   (contents, props changed)
>   head/sys/dev/mxge/if_mxge.c   (contents, props changed)
>   head/sys/dev/my/if_my.c   (contents, props changed)
>   head/sys/dev/nvram2env/nvram2env.c   (contents, props changed)
>   head/sys/dev/nxge/if_nxge.c   (contents, props changed)
>   head/sys/dev/oce/oce_if.c   (contents, props changed)
>   head/sys/dev/sdhci/sdhci_pci.c
>   head/sys/dev/sound/pci/emu10kx-midi.c   (contents, props changed)
>   head/sys/dev/sound/pci/emu10kx-pcm.c   (contents, props changed)
>   head/sys/dev/sound/pci/emu10kx.c   (contents, props changed)
>   head/sys/dev/sound/sbus/cs4231.c   (contents, props changed)
>   head/sys/dev/sound/usb/uaudio_pcm.c
>   head/sys/dev/usb/controller/usb_controller.c
>   head/sys/dev/usb/input/uhid.c
>   head/sys/dev/usb/input/ukbd.c
>   head/sys/dev/usb/input/ums.c
>   head/sys/dev/usb/misc/udbp.c
>   head/sys/dev/usb/misc/ufm.c
>   head/sys/dev/usb/net/if_cdce.c
>   head/sys/dev/usb/net/if_cue.c
>   head/sys/dev/usb/net/if_ipheth.c
>   head/sys/dev/usb/net/if_kue.c
>   head/sys/dev/usb/net/if_smsc.c
>   head/sys/dev/usb/storage/umass.c
>   head/sys/dev/usb/storage/urio.c
>   head/sys/dev/usb/storage/ustorage_fs.c
>   head/sys/dev/usb/usb_compat_linux.c
>   head/sys/dev/vx/if_vx_eisa.c   (contents, props changed)
>   head/sys/dev/vx/if_vx_pci.c   (contents, props changed)
>   head/sys/dev/vxge/vxge.c   (contents, props changed)
>   head/sys/dev/xen/console/console.c
> 
> Modified: head/sys/dev/acpi_support/acpi_asus_wmi.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_asus_wmi.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_asus_wmi.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -304,7 +304,8 @@ static device_method_t acpi_asus_wmi_met
>  	DEVMETHOD(device_probe, acpi_asus_wmi_probe),
>  	DEVMETHOD(device_attach, acpi_asus_wmi_attach),
>  	DEVMETHOD(device_detach, acpi_asus_wmi_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t	acpi_asus_wmi_driver = {
> 
> Modified: head/sys/dev/acpi_support/acpi_fujitsu.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_fujitsu.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_fujitsu.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -154,7 +154,8 @@ static device_method_t acpi_fujitsu_meth
>  	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 = {
> 
> Modified: head/sys/dev/acpi_support/acpi_hp.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_hp.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_hp.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -324,7 +324,8 @@ 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 = {
> 
> Modified: head/sys/dev/acpi_support/acpi_ibm.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_ibm.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_ibm.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -303,7 +303,7 @@ static device_method_t acpi_ibm_methods[
>  	DEVMETHOD(device_detach, acpi_ibm_detach),
>  	DEVMETHOD(device_resume, acpi_ibm_resume),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t	acpi_ibm_driver = {
> 
> Modified: head/sys/dev/acpi_support/acpi_panasonic.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_panasonic.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_panasonic.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -118,7 +118,7 @@ static device_method_t acpi_panasonic_me
>  	DEVMETHOD(device_detach,	acpi_panasonic_detach),
>  	DEVMETHOD(device_shutdown,	acpi_panasonic_shutdown),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t acpi_panasonic_driver = {
> 
> Modified: head/sys/dev/acpi_support/acpi_sony.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_sony.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_sony.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -95,7 +95,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 = {
> 
> Modified: head/sys/dev/acpi_support/acpi_toshiba.c
> ==============================================================================
> --- head/sys/dev/acpi_support/acpi_toshiba.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpi_support/acpi_toshiba.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -172,7 +172,7 @@ static device_method_t acpi_toshiba_meth
>  	DEVMETHOD(device_attach,	acpi_toshiba_attach),
>  	DEVMETHOD(device_detach,	acpi_toshiba_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t acpi_toshiba_driver = {
> @@ -190,7 +190,7 @@ static device_method_t acpi_toshiba_vide
>  	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 = {
> 
> Modified: head/sys/dev/acpica/acpi.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -217,7 +217,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 = {
> 
> Modified: head/sys/dev/acpica/acpi_acad.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_acad.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_acad.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -74,7 +74,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 = {
> 
> Modified: head/sys/dev/acpica/acpi_button.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_button.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_button.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -79,8 +79,7 @@ static device_method_t acpi_button_metho
>      DEVMETHOD(device_suspend,	acpi_button_suspend),
>      DEVMETHOD(device_shutdown,	acpi_button_suspend),
>      DEVMETHOD(device_resume,	acpi_button_resume),
> -
> -    {0, 0}
> +    DEVMETHOD_END
>  };
>  
>  static driver_t acpi_button_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_cmbat.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_cmbat.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_cmbat.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -99,7 +99,7 @@ static device_method_t acpi_cmbat_method
>      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 = {
> 
> Modified: head/sys/dev/acpica/acpi_dock.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_dock.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_dock.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -521,7 +521,7 @@ static device_method_t acpi_dock_methods
>  	DEVMETHOD(device_probe, acpi_dock_probe),
>  	DEVMETHOD(device_attach, acpi_dock_attach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t	acpi_dock_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_ec.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_ec.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_ec.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -253,7 +253,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 = {
> 
> Modified: head/sys/dev/acpica/acpi_hpet.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_hpet.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_hpet.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -849,7 +849,7 @@ static device_method_t hpet_methods[] = 
>  	DEVMETHOD(bus_remap_intr, hpet_remap_intr),
>  #endif
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t	hpet_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_lid.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_lid.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_lid.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -69,7 +69,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 = {
> 
> Modified: head/sys/dev/acpica/acpi_pci.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_pci.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_pci.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -94,7 +94,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;
> 
> Modified: head/sys/dev/acpica/acpi_pci_link.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_pci_link.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_pci_link.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -1097,7 +1097,7 @@ static device_method_t acpi_pci_link_met
>  	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 = {
> 
> Modified: head/sys/dev/acpica/acpi_pcib_pci.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_pcib_pci.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_pcib_pci.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -83,7 +83,7 @@ static device_method_t acpi_pcib_pci_met
>      DEVMETHOD(pcib_route_interrupt,	acpi_pcib_pci_route_interrupt),
>      DEVMETHOD(pcib_power_for_sleep,	acpi_pcib_power_for_sleep),
>  
> -    {0, 0}
> +    DEVMETHOD_END
>  };
>  
>  static devclass_t pcib_devclass;
> 
> Modified: head/sys/dev/acpica/acpi_perf.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_perf.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_perf.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -122,7 +122,8 @@ static device_method_t acpi_perf_methods
>  	DEVMETHOD(cpufreq_drv_get,	acpi_px_get),
>  	DEVMETHOD(cpufreq_drv_type,	acpi_px_type),
>  	DEVMETHOD(cpufreq_drv_settings,	acpi_px_settings),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t acpi_perf_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_resource.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_resource.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_resource.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -615,7 +615,7 @@ static device_method_t acpi_sysres_metho
>      DEVMETHOD(device_probe,	acpi_sysres_probe),
>      DEVMETHOD(device_attach,	acpi_sysres_attach),
>  
> -    {0, 0}
> +    DEVMETHOD_END
>  };
>  
>  static driver_t acpi_sysres_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_smbat.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_smbat.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_smbat.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -89,7 +89,7 @@ static device_method_t acpi_smbat_method
>  	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 = {
> 
> Modified: head/sys/dev/acpica/acpi_thermal.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_thermal.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_thermal.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -152,7 +152,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 = {
> 
> Modified: head/sys/dev/acpica/acpi_throttle.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_throttle.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_throttle.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -114,7 +114,7 @@ static device_method_t acpi_throttle_met
>  	DEVMETHOD(cpufreq_drv_get,	acpi_thr_get),
>  	DEVMETHOD(cpufreq_drv_type,	acpi_thr_type),
>  	DEVMETHOD(cpufreq_drv_settings,	acpi_thr_settings),
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t acpi_throttle_driver = {
> 
> Modified: head/sys/dev/acpica/acpi_timer.c
> ==============================================================================
> --- head/sys/dev/acpica/acpi_timer.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/acpica/acpi_timer.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -82,7 +82,7 @@ static device_method_t acpi_timer_method
>      DEVMETHOD(device_probe,	acpi_timer_probe),
>      DEVMETHOD(device_attach,	acpi_timer_attach),
>  
> -    {0, 0}
> +    DEVMETHOD_END
>  };
>  
>  static driver_t acpi_timer_driver = {
> 
> Modified: head/sys/dev/adlink/adlink.c
> ==============================================================================
> --- head/sys/dev/adlink/adlink.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/adlink/adlink.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -407,7 +407,8 @@ static device_method_t adlink_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 adlink_driver = {
> 
> Modified: head/sys/dev/amdsbwd/amdsbwd.c
> ==============================================================================
> --- head/sys/dev/amdsbwd/amdsbwd.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/amdsbwd/amdsbwd.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -139,7 +139,7 @@ static device_method_t amdsbwd_methods[]
>  #if 0
>  	DEVMETHOD(device_shutdown,	amdsbwd_detach),
>  #endif
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static devclass_t	amdsbwd_devclass;
> 
> Modified: head/sys/dev/amdtemp/amdtemp.c
> ==============================================================================
> --- head/sys/dev/amdtemp/amdtemp.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/amdtemp/amdtemp.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -134,7 +134,7 @@ static device_method_t amdtemp_methods[]
>  	DEVMETHOD(device_attach,	amdtemp_attach),
>  	DEVMETHOD(device_detach,	amdtemp_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t amdtemp_driver = {
> 
> Modified: head/sys/dev/auxio/auxio.c
> ==============================================================================
> --- head/sys/dev/auxio/auxio.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/auxio/auxio.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -131,7 +131,8 @@ static device_method_t auxio_sbus_method
>  	DEVMETHOD(device_probe,		auxio_bus_probe),
>  	DEVMETHOD(device_attach,	auxio_sbus_attach),
>  	DEVMETHOD(device_detach,	auxio_bus_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t auxio_sbus_driver = {
> @@ -151,7 +152,8 @@ static device_method_t auxio_ebus_method
>  	DEVMETHOD(device_probe,		auxio_bus_probe),
>  	DEVMETHOD(device_attach,	auxio_ebus_attach),
>  	DEVMETHOD(device_detach,	auxio_bus_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t auxio_ebus_driver = {
> 
> Modified: head/sys/dev/ce/if_ce.c
> ==============================================================================
> --- head/sys/dev/ce/if_ce.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ce/if_ce.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -145,7 +145,7 @@ static	device_method_t ce_methods[] = {
>  	DEVMETHOD(device_attach,	ce_attach),
>  	DEVMETHOD(device_detach,	ce_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  typedef struct _ce_dma_mem_t {
> 
> Modified: head/sys/dev/cfi/cfi_bus_fdt.c
> ==============================================================================
> --- head/sys/dev/cfi/cfi_bus_fdt.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/cfi/cfi_bus_fdt.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -51,7 +51,7 @@ static device_method_t cfi_fdt_methods[]
>  	DEVMETHOD(device_attach,	cfi_attach),
>  	DEVMETHOD(device_detach,	cfi_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t cfi_fdt_driver = {
> 
> Modified: head/sys/dev/cfi/cfi_bus_ixp4xx.c
> ==============================================================================
> --- head/sys/dev/cfi/cfi_bus_ixp4xx.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/cfi/cfi_bus_ixp4xx.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -69,7 +69,7 @@ static device_method_t cfi_ixp4xx_method
>  	DEVMETHOD(device_attach,	cfi_attach),
>  	DEVMETHOD(device_detach,	cfi_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t cfi_ixp4xx_driver = {
> 
> Modified: head/sys/dev/coretemp/coretemp.c
> ==============================================================================
> --- head/sys/dev/coretemp/coretemp.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/coretemp/coretemp.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -85,7 +85,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 = {
> 
> Modified: head/sys/dev/cp/if_cp.c
> ==============================================================================
> --- head/sys/dev/cp/if_cp.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/cp/if_cp.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -93,7 +93,7 @@ static	device_method_t cp_methods[] = {
>  	DEVMETHOD(device_attach,	cp_attach),
>  	DEVMETHOD(device_detach,	cp_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  typedef struct _cp_dma_mem_t {
> 
> Modified: head/sys/dev/cpufreq/ichss.c
> ==============================================================================
> --- head/sys/dev/cpufreq/ichss.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/cpufreq/ichss.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -113,7 +113,7 @@ static device_method_t ichss_methods[] =
>  	DEVMETHOD(cpufreq_drv_get,	ichss_get),
>  	DEVMETHOD(cpufreq_drv_type,	ichss_type),
>  	DEVMETHOD(cpufreq_drv_settings,	ichss_settings),
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  static driver_t ichss_driver = {
>  	"ichss", ichss_methods, sizeof(struct ichss_softc)
> 
> Modified: head/sys/dev/ctau/if_ct.c
> ==============================================================================
> --- head/sys/dev/ctau/if_ct.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ctau/if_ct.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -93,7 +93,8 @@ static device_method_t ct_isa_methods []
>  	DEVMETHOD(device_probe,		ct_probe),
>  	DEVMETHOD(device_attach,	ct_attach),
>  	DEVMETHOD(device_detach,	ct_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  typedef struct _ct_dma_mem_t {
> 
> Modified: head/sys/dev/cx/if_cx.c
> ==============================================================================
> --- head/sys/dev/cx/if_cx.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/cx/if_cx.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -113,7 +113,8 @@ static device_method_t cx_isa_methods []
>  	DEVMETHOD(device_probe,		cx_probe),
>  	DEVMETHOD(device_attach,	cx_attach),
>  	DEVMETHOD(device_detach,	cx_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  typedef struct _cx_dma_mem_t {
> 
> Modified: head/sys/dev/digi/digi_isa.c
> ==============================================================================
> --- head/sys/dev/digi/digi_isa.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/digi/digi_isa.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -462,7 +462,8 @@ static device_method_t digi_isa_methods[
>  	DEVMETHOD(device_attach, digi_isa_attach),
>  	DEVMETHOD(device_detach, digi_detach),
>  	DEVMETHOD(device_shutdown, digi_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t digi_isa_drv = {
> 
> Modified: head/sys/dev/digi/digi_pci.c
> ==============================================================================
> --- head/sys/dev/digi/digi_pci.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/digi/digi_pci.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -219,7 +219,8 @@ static device_method_t digi_pci_methods[
>  	DEVMETHOD(device_attach, digi_pci_attach),
>  	DEVMETHOD(device_detach, digi_detach),
>  	DEVMETHOD(device_shutdown, digi_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t digi_pci_drv = {
> 
> Modified: head/sys/dev/e1000/if_em.c
> ==============================================================================
> --- head/sys/dev/e1000/if_em.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/e1000/if_em.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -309,7 +309,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 = {
> 
> Modified: head/sys/dev/e1000/if_igb.c
> ==============================================================================
> --- head/sys/dev/e1000/if_igb.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/e1000/if_igb.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -294,7 +294,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 = {
> 
> Modified: head/sys/dev/e1000/if_lem.c
> ==============================================================================
> --- head/sys/dev/e1000/if_lem.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/e1000/if_lem.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -262,7 +262,7 @@ static device_method_t lem_methods[] = {
>  	DEVMETHOD(device_shutdown, lem_shutdown),
>  	DEVMETHOD(device_suspend, lem_suspend),
>  	DEVMETHOD(device_resume, lem_resume),
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t lem_driver = {
> 
> Modified: head/sys/dev/ep/if_ep_eisa.c
> ==============================================================================
> --- head/sys/dev/ep/if_ep_eisa.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ep/if_ep_eisa.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -238,7 +238,7 @@ static device_method_t ep_eisa_methods[]
>  	DEVMETHOD(device_attach, ep_eisa_attach),
>  	DEVMETHOD(device_detach, ep_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ep_eisa_driver = {
> 
> Modified: head/sys/dev/ep/if_ep_isa.c
> ==============================================================================
> --- head/sys/dev/ep/if_ep_isa.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ep/if_ep_isa.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -391,7 +391,7 @@ static device_method_t ep_isa_methods[] 
>  	DEVMETHOD(device_attach, ep_isa_attach),
>  	DEVMETHOD(device_detach, ep_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ep_isa_driver = {
> 
> Modified: head/sys/dev/ep/if_ep_mca.c
> ==============================================================================
> --- head/sys/dev/ep/if_ep_mca.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ep/if_ep_mca.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -145,7 +145,7 @@ static device_method_t ep_mca_methods[] 
>  	DEVMETHOD(device_attach, ep_mca_attach),
>  	DEVMETHOD(device_detach, ep_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ep_mca_driver = {
> 
> Modified: head/sys/dev/ep/if_ep_pccard.c
> ==============================================================================
> --- head/sys/dev/ep/if_ep_pccard.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ep/if_ep_pccard.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -223,7 +223,7 @@ static device_method_t ep_pccard_methods
>  	DEVMETHOD(device_attach, ep_pccard_attach),
>  	DEVMETHOD(device_detach, ep_detach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ep_pccard_driver = {
> 
> Modified: head/sys/dev/fdc/fdc_acpi.c
> ==============================================================================
> --- head/sys/dev/fdc/fdc_acpi.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/fdc/fdc_acpi.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -258,7 +258,7 @@ static device_method_t fdc_acpi_methods[
>  	DEVMETHOD(bus_read_ivar,	fdc_read_ivar),
>  	DEVMETHOD(bus_write_ivar,	fdc_write_ivar),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t fdc_acpi_driver = {
> 
> Modified: head/sys/dev/iicbus/ad7418.c
> ==============================================================================
> --- head/sys/dev/iicbus/ad7418.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/iicbus/ad7418.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -219,7 +219,7 @@ static device_method_t ad7418_methods[] 
>  	DEVMETHOD(device_probe,		ad7418_probe),
>  	DEVMETHOD(device_attach,	ad7418_attach),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ad7418_driver = {
> 
> Modified: head/sys/dev/iicbus/ds133x.c
> ==============================================================================
> --- head/sys/dev/iicbus/ds133x.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/iicbus/ds133x.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -347,7 +347,7 @@ static device_method_t ds133x_methods[] 
>  	DEVMETHOD(clock_gettime,	ds133x_gettime),
>  	DEVMETHOD(clock_settime,	ds133x_settime),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ds133x_driver = {
> 
> Modified: head/sys/dev/iicbus/ds1672.c
> ==============================================================================
> --- head/sys/dev/iicbus/ds1672.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/iicbus/ds1672.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -167,7 +167,7 @@ static device_method_t ds1672_methods[] 
>  	DEVMETHOD(clock_gettime,	ds1672_gettime),
>  	DEVMETHOD(clock_settime,	ds1672_settime),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ds1672_driver = {
> 
> Modified: head/sys/dev/iicbus/icee.c
> ==============================================================================
> --- head/sys/dev/iicbus/icee.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/iicbus/icee.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -262,7 +262,7 @@ static device_method_t icee_methods[] = 
>  	DEVMETHOD(device_probe,		icee_probe),
>  	DEVMETHOD(device_attach,	icee_attach),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t icee_driver = {
> 
> Modified: head/sys/dev/ixgb/if_ixgb.c
> ==============================================================================
> --- head/sys/dev/ixgb/if_ixgb.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ixgb/if_ixgb.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -159,7 +159,8 @@ static device_method_t ixgb_methods[] = 
>  	DEVMETHOD(device_attach, ixgb_attach),
>  	DEVMETHOD(device_detach, ixgb_detach),
>  	DEVMETHOD(device_shutdown, ixgb_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ixgb_driver = {
> 
> Modified: head/sys/dev/ixgbe/ixgbe.c
> ==============================================================================
> --- head/sys/dev/ixgbe/ixgbe.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ixgbe/ixgbe.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -216,7 +216,8 @@ 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 = {
> 
> Modified: head/sys/dev/ixgbe/ixv.c
> ==============================================================================
> --- head/sys/dev/ixgbe/ixv.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/ixgbe/ixv.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -169,7 +169,8 @@ static device_method_t ixv_methods[] = {
>  	DEVMETHOD(device_attach, ixv_attach),
>  	DEVMETHOD(device_detach, ixv_detach),
>  	DEVMETHOD(device_shutdown, ixv_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ixv_driver = {
> 
> Modified: head/sys/dev/mfi/mfi_cam.c
> ==============================================================================
> --- head/sys/dev/mfi/mfi_cam.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/mfi/mfi_cam.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -99,7 +99,8 @@ static device_method_t	mfip_methods[] = 
>  	DEVMETHOD(device_probe,		mfip_probe),
>  	DEVMETHOD(device_attach,	mfip_attach),
>  	DEVMETHOD(device_detach,	mfip_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  static driver_t mfip_driver = {
>  	"mfip",
> 
> Modified: head/sys/dev/mn/if_mn.c
> ==============================================================================
> --- head/sys/dev/mn/if_mn.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/mn/if_mn.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -1418,7 +1418,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 = {
> 
> Modified: head/sys/dev/mxge/if_mxge.c
> ==============================================================================
> --- head/sys/dev/mxge/if_mxge.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/mxge/if_mxge.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -124,7 +124,8 @@ 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 =
> 
> Modified: head/sys/dev/my/if_my.c
> ==============================================================================
> --- head/sys/dev/my/if_my.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/my/if_my.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -153,7 +153,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 = {
> 
> Modified: head/sys/dev/nvram2env/nvram2env.c
> ==============================================================================
> --- head/sys/dev/nvram2env/nvram2env.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/nvram2env/nvram2env.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -303,7 +303,8 @@ static device_method_t nvram2env_methods
>  	DEVMETHOD(device_identify, 	nvram2env_identify),
>  	DEVMETHOD(device_probe,		nvram2env_probe),
>  	DEVMETHOD(device_attach,	nvram2env_attach),
> -	{0, 0},
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t nvram2env_driver = {
> 
> Modified: head/sys/dev/nxge/if_nxge.c
> ==============================================================================
> --- head/sys/dev/nxge/if_nxge.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/nxge/if_nxge.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -3507,7 +3507,8 @@ static device_method_t xge_methods[] = {
>  	DEVMETHOD(device_attach,    xge_attach),
>  	DEVMETHOD(device_detach,    xge_detach),
>  	DEVMETHOD(device_shutdown,  xge_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t xge_driver = {
> 
> Modified: head/sys/dev/oce/oce_if.c
> ==============================================================================
> --- head/sys/dev/oce/oce_if.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/oce/oce_if.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -108,7 +108,8 @@ static device_method_t oce_dispatch[] = 
>  	DEVMETHOD(device_attach, oce_attach),
>  	DEVMETHOD(device_detach, oce_detach),
>  	DEVMETHOD(device_shutdown, oce_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t oce_driver = {
> 
> Modified: head/sys/dev/sdhci/sdhci_pci.c
> ==============================================================================
> --- head/sys/dev/sdhci/sdhci_pci.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sdhci/sdhci_pci.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -426,7 +426,7 @@ static device_method_t sdhci_methods[] =
>  	DEVMETHOD(sdhci_write_4,	sdhci_pci_write_4),
>  	DEVMETHOD(sdhci_write_multi_4,	sdhci_pci_write_multi_4),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t sdhci_pci_driver = {
> 
> Modified: head/sys/dev/sound/pci/emu10kx-midi.c
> ==============================================================================
> --- head/sys/dev/sound/pci/emu10kx-midi.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sound/pci/emu10kx-midi.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -239,7 +239,7 @@ static device_method_t emu_midi_methods[
>  	DEVMETHOD(device_attach, emu_midi_attach),
>  	DEVMETHOD(device_detach, emu_midi_detach),
>  
> -	{0, 0},
> +	DEVMETHOD_END
>  };
>  
>  static driver_t emu_midi_driver = {
> 
> Modified: head/sys/dev/sound/pci/emu10kx-pcm.c
> ==============================================================================
> --- head/sys/dev/sound/pci/emu10kx-pcm.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sound/pci/emu10kx-pcm.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -1520,7 +1520,8 @@ static device_method_t emu_pcm_methods[]
>  	DEVMETHOD(device_probe, emu_pcm_probe),
>  	DEVMETHOD(device_attach, emu_pcm_attach),
>  	DEVMETHOD(device_detach, emu_pcm_detach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t emu_pcm_driver = {
> 
> Modified: head/sys/dev/sound/pci/emu10kx.c
> ==============================================================================
> --- head/sys/dev/sound/pci/emu10kx.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sound/pci/emu10kx.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -3529,7 +3529,7 @@ static device_method_t emu_methods[] = {
>  	DEVMETHOD(bus_read_ivar, emu_read_ivar),
>  	DEVMETHOD(bus_write_ivar, emu_write_ivar),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  
> 
> Modified: head/sys/dev/sound/sbus/cs4231.c
> ==============================================================================
> --- head/sys/dev/sound/sbus/cs4231.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sound/sbus/cs4231.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -231,7 +231,8 @@ static device_method_t cs4231_sbus_metho
>  	DEVMETHOD(device_detach,	cs4231_bus_detach),
>  	DEVMETHOD(device_suspend,	cs4231_bus_suspend),
>  	DEVMETHOD(device_resume,	cs4231_bus_resume),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t cs4231_sbus_driver = {
> @@ -249,7 +250,8 @@ static device_method_t cs4231_ebus_metho
>  	DEVMETHOD(device_detach,	cs4231_bus_detach),
>  	DEVMETHOD(device_suspend,	cs4231_bus_suspend),
>  	DEVMETHOD(device_resume,	cs4231_bus_resume),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t cs4231_ebus_driver = {
> 
> Modified: head/sys/dev/sound/usb/uaudio_pcm.c
> ==============================================================================
> --- head/sys/dev/sound/usb/uaudio_pcm.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/sound/usb/uaudio_pcm.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -227,7 +227,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 = {
> 
> Modified: head/sys/dev/usb/controller/usb_controller.c
> ==============================================================================
> --- head/sys/dev/usb/controller/usb_controller.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/controller/usb_controller.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -114,7 +114,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/input/uhid.c
> ==============================================================================
> --- head/sys/dev/usb/input/uhid.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/input/uhid.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -852,7 +852,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/input/ukbd.c
> ==============================================================================
> --- head/sys/dev/usb/input/ukbd.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/input/ukbd.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -2120,7 +2120,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/input/ums.c
> ==============================================================================
> --- head/sys/dev/usb/input/ums.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/input/ums.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -1039,7 +1039,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/misc/udbp.c
> ==============================================================================
> --- head/sys/dev/usb/misc/udbp.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/misc/udbp.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -248,7 +248,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/misc/ufm.c
> ==============================================================================
> --- head/sys/dev/usb/misc/ufm.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/misc/ufm.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -105,7 +105,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/net/if_cdce.c
> ==============================================================================
> --- head/sys/dev/usb/net/if_cdce.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/net/if_cdce.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -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 = {
> 
> Modified: head/sys/dev/usb/net/if_cue.c
> ==============================================================================
> --- head/sys/dev/usb/net/if_cue.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/net/if_cue.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -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 = {
> 
> Modified: head/sys/dev/usb/net/if_ipheth.c
> ==============================================================================
> --- head/sys/dev/usb/net/if_ipheth.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/net/if_ipheth.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -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 = {
> 
> Modified: head/sys/dev/usb/net/if_kue.c
> ==============================================================================
> --- head/sys/dev/usb/net/if_kue.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/net/if_kue.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -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 = {
> 
> Modified: head/sys/dev/usb/net/if_smsc.c
> ==============================================================================
> --- head/sys/dev/usb/net/if_smsc.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/net/if_smsc.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -1810,7 +1810,7 @@ static device_method_t smsc_methods[] = 
>  	DEVMETHOD(miibus_writereg, smsc_miibus_writereg),
>  	DEVMETHOD(miibus_statchg, smsc_miibus_statchg),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t smsc_driver = {
> 
> Modified: head/sys/dev/usb/storage/umass.c
> ==============================================================================
> --- head/sys/dev/usb/storage/umass.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/storage/umass.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -698,7 +698,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/storage/urio.c
> ==============================================================================
> --- head/sys/dev/usb/storage/urio.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/storage/urio.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -185,7 +185,8 @@ 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 = {
> 
> Modified: head/sys/dev/usb/storage/ustorage_fs.c
> ==============================================================================
> --- head/sys/dev/usb/storage/ustorage_fs.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/storage/ustorage_fs.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -256,7 +256,7 @@ static device_method_t ustorage_fs_metho
>  	DEVMETHOD(device_suspend, ustorage_fs_suspend),
>  	DEVMETHOD(device_resume, ustorage_fs_resume),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t ustorage_fs_driver = {
> 
> Modified: head/sys/dev/usb/usb_compat_linux.c
> ==============================================================================
> --- head/sys/dev/usb/usb_compat_linux.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/usb/usb_compat_linux.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -113,7 +113,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 = {
> 
> Modified: head/sys/dev/vx/if_vx_eisa.c
> ==============================================================================
> --- head/sys/dev/vx/if_vx_eisa.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/vx/if_vx_eisa.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -177,7 +177,7 @@ static device_method_t vx_eisa_methods[]
>  	DEVMETHOD(device_probe, vx_eisa_probe),
>  	DEVMETHOD(device_attach, vx_eisa_attach),
>  
> -	{0, 0}
> +	DEVMETHOD_END
>  };
>  
>  static driver_t vx_eisa_driver = {
> 
> Modified: head/sys/dev/vx/if_vx_pci.c
> ==============================================================================
> --- head/sys/dev/vx/if_vx_pci.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/vx/if_vx_pci.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -61,7 +61,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 = {
> 
> Modified: head/sys/dev/vxge/vxge.c
> ==============================================================================
> --- head/sys/dev/vxge/vxge.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/vxge/vxge.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -4188,7 +4188,8 @@ static device_method_t vxge_methods[] = 
>  	DEVMETHOD(device_attach, vxge_attach),
>  	DEVMETHOD(device_detach, vxge_detach),
>  	DEVMETHOD(device_shutdown, vxge_shutdown),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t vxge_driver = {
> 
> Modified: head/sys/dev/xen/console/console.c
> ==============================================================================
> --- head/sys/dev/xen/console/console.c	Wed Jan 30 17:39:43 2013	(r246127)
> +++ head/sys/dev/xen/console/console.c	Wed Jan 30 18:01:20 2013	(r246128)
> @@ -410,7 +410,8 @@ static device_method_t xc_methods[] = {
>  	DEVMETHOD(device_identify, xc_identify),
>  	DEVMETHOD(device_probe, xc_probe),
>  	DEVMETHOD(device_attach, xc_attach),
> -	{0, 0}
> +
> +	DEVMETHOD_END
>  };
>  
>  static driver_t xc_driver = {
> _______________________________________________
> svn-src-all at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"

Hi,

This patch is to replace all the sentinel hardcoded using {0, 0} by the proper
definition of the macro DEVMETHOD_END located in the <sys/bus.h> include in all
drivers code in sys/dev path of the FreeBSD head source.

I catch all the same pattern using command line below:

 $ ack -ri '{0, 0}' --type-set cc=.c,.h /usr/src/sys/dev

I also rebuild the kernel before to commit it using the command line below:

 $ sudo make buildkernel KERNCONF=GENERIC

and everything seems fine regarding the log [1] on amd64 platform.

Regards

[1] http://people.freebsd.org/~sbz/devmethod_end.log

--
Sofian Brabez
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20130130/4a49cb20/attachment-0001.sig>


More information about the svn-src-all mailing list