Author: hselasky
Date: Sat Dec 31 14:12:12 2011
New Revision: 229093
URL: http://svn.freebsd.org/changeset/base/229093
Log:
MFC r226173, r227843, r227848 and r227908:
Use DEVMETHOD_END to mark end of device methods.
Remove superfluous device methods.
Add some missing __FBSBID() macros.
Modified:
stable/9/sys/amd64/amd64/legacy.c
stable/9/sys/arm/econa/ehci_ebus.c
stable/9/sys/arm/econa/ohci_ec.c
stable/9/sys/arm/mv/mv_pci.c
stable/9/sys/arm/xscale/i80321/i80321_pci.c
stable/9/sys/arm/xscale/i8134x/i81342_pci.c
stable/9/sys/arm/xscale/ixp425/ixp425_pci.c
stable/9/sys/dev/aac/aac_pci.c
stable/9/sys/dev/acpi_support/acpi_wmi.c
stable/9/sys/dev/acpica/acpi_cpu.c
stable/9/sys/dev/acpica/acpi_isab.c
stable/9/sys/dev/acpica/acpi_pcib_acpi.c
stable/9/sys/dev/amr/amr_pci.c
stable/9/sys/dev/arcmsr/arcmsr.c
stable/9/sys/dev/bce/if_bce.c
stable/9/sys/dev/bfe/if_bfe.c
stable/9/sys/dev/bge/if_bge.c
stable/9/sys/dev/bm/if_bm.c
stable/9/sys/dev/bwn/if_bwn.c
stable/9/sys/dev/bxe/if_bxe.c
stable/9/sys/dev/cas/if_cas.c
stable/9/sys/dev/cxgb/cxgb_main.c
stable/9/sys/dev/cxgbe/t4_main.c
stable/9/sys/dev/dc/dcphy.c
stable/9/sys/dev/dc/if_dc.c
stable/9/sys/dev/dc/pnphy.c
stable/9/sys/dev/eisa/eisaconf.c
stable/9/sys/dev/esp/esp_pci.c
stable/9/sys/dev/esp/esp_sbus.c
stable/9/sys/dev/et/if_et.c
stable/9/sys/dev/fb/fb.c
stable/9/sys/dev/firewire/firewire.c
stable/9/sys/dev/firewire/fwohci_pci.c
stable/9/sys/dev/gem/if_gem_pci.c
stable/9/sys/dev/gem/if_gem_sbus.c
stable/9/sys/dev/gpio/gpiobus.c
stable/9/sys/dev/hifn/hifn7751.c
stable/9/sys/dev/hme/if_hme_pci.c
stable/9/sys/dev/hme/if_hme_sbus.c
stable/9/sys/dev/ichsmb/ichsmb_pci.c
stable/9/sys/dev/ida/ida_pci.c
stable/9/sys/dev/if_ndis/if_ndis_usb.c
stable/9/sys/dev/iicbus/iicbus.c
stable/9/sys/dev/iicbus/iicsmb.c
stable/9/sys/dev/lge/if_lge.c
stable/9/sys/dev/mca/mca_bus.c
stable/9/sys/dev/mfi/mfi_pci.c
stable/9/sys/dev/mii/acphy.c
stable/9/sys/dev/mii/amphy.c
stable/9/sys/dev/mii/atphy.c
stable/9/sys/dev/mii/axphy.c
stable/9/sys/dev/mii/bmtphy.c
stable/9/sys/dev/mii/brgphy.c
stable/9/sys/dev/mii/ciphy.c
stable/9/sys/dev/mii/e1000phy.c
stable/9/sys/dev/mii/gentbi.c
stable/9/sys/dev/mii/icsphy.c
stable/9/sys/dev/mii/ip1000phy.c
stable/9/sys/dev/mii/jmphy.c
stable/9/sys/dev/mii/lxtphy.c
stable/9/sys/dev/mii/mii.c
stable/9/sys/dev/mii/mlphy.c
stable/9/sys/dev/mii/nsgphy.c
stable/9/sys/dev/mii/nsphy.c
stable/9/sys/dev/mii/nsphyter.c
stable/9/sys/dev/mii/pnaphy.c
stable/9/sys/dev/mii/qsphy.c
stable/9/sys/dev/mii/rdcphy.c
stable/9/sys/dev/mii/rgephy.c
stable/9/sys/dev/mii/rlphy.c
stable/9/sys/dev/mii/rlswitch.c
stable/9/sys/dev/mii/smcphy.c
stable/9/sys/dev/mii/tdkphy.c
stable/9/sys/dev/mii/tlphy.c
stable/9/sys/dev/mii/truephy.c
stable/9/sys/dev/mii/ukphy.c
stable/9/sys/dev/mii/xmphy.c
stable/9/sys/dev/mlx/mlx_pci.c
stable/9/sys/dev/mps/mps_pci.c
stable/9/sys/dev/msk/if_msk.c
stable/9/sys/dev/nfe/if_nfe.c
stable/9/sys/dev/nge/if_nge.c
stable/9/sys/dev/nve/if_nve.c
stable/9/sys/dev/ofw/ofw_iicbus.c
stable/9/sys/dev/pccbb/pccbb_isa.c
stable/9/sys/dev/pccbb/pccbb_pci.c
stable/9/sys/dev/pci/eisa_pci.c
stable/9/sys/dev/pci/isa_pci.c
stable/9/sys/dev/pci/pci_pci.c
stable/9/sys/dev/pcn/if_pcn.c
stable/9/sys/dev/ppbus/lpbb.c
stable/9/sys/dev/puc/puc_pccard.c
stable/9/sys/dev/puc/puc_pci.c
stable/9/sys/dev/quicc/quicc_bfe_fdt.c
stable/9/sys/dev/re/if_re.c
stable/9/sys/dev/rt/if_rt.c
stable/9/sys/dev/safe/safe.c
stable/9/sys/dev/scc/scc_bfe_ebus.c
stable/9/sys/dev/scc/scc_bfe_macio.c
stable/9/sys/dev/scc/scc_bfe_quicc.c
stable/9/sys/dev/scc/scc_bfe_sbus.c
stable/9/sys/dev/sec/sec.c
stable/9/sys/dev/sf/if_sf.c
stable/9/sys/dev/sfxge/sfxge.c
stable/9/sys/dev/sge/if_sge.c
stable/9/sys/dev/siba/siba.c
stable/9/sys/dev/siba/siba_bwn.c
stable/9/sys/dev/siba/siba_cc.c
stable/9/sys/dev/siba/siba_pcib.c
stable/9/sys/dev/sis/if_sis.c
stable/9/sys/dev/sk/if_sk.c
stable/9/sys/dev/smbus/smbus.c
stable/9/sys/dev/sound/isa/gusc.c
stable/9/sys/dev/sound/isa/sbc.c
stable/9/sys/dev/sound/pci/csa.c
stable/9/sys/dev/sound/pci/fm801.c
stable/9/sys/dev/sound/usb/uaudio.c
stable/9/sys/dev/spibus/spibus.c
stable/9/sys/dev/ste/if_ste.c
stable/9/sys/dev/stge/if_stge.c
stable/9/sys/dev/tl/if_tl.c
stable/9/sys/dev/tsec/if_tsec_fdt.c
stable/9/sys/dev/twa/tw_osl_freebsd.c
stable/9/sys/dev/twe/twe_freebsd.c
stable/9/sys/dev/tws/tws.c
stable/9/sys/dev/ubsec/ubsec.c
stable/9/sys/dev/usb/controller/at91dci_atmelarm.c
stable/9/sys/dev/usb/controller/atmegadci_atmelarm.c
stable/9/sys/dev/usb/controller/ehci_ixp4xx.c
stable/9/sys/dev/usb/controller/ehci_mv.c
stable/9/sys/dev/usb/controller/ehci_pci.c
stable/9/sys/dev/usb/controller/musb_otg_atmelarm.c
stable/9/sys/dev/usb/controller/ohci_atmelarm.c
stable/9/sys/dev/usb/controller/ohci_pci.c
stable/9/sys/dev/usb/controller/ohci_s3c24x0.c
stable/9/sys/dev/usb/controller/uhci_pci.c
stable/9/sys/dev/usb/controller/uss820dci_atmelarm.c
stable/9/sys/dev/usb/controller/xhci_pci.c
stable/9/sys/dev/usb/net/if_aue.c
stable/9/sys/dev/usb/net/if_axe.c
stable/9/sys/dev/usb/net/if_mos.c
stable/9/sys/dev/usb/net/if_rue.c
stable/9/sys/dev/usb/net/if_udav.c
stable/9/sys/dev/usb/net/ruephy.c
stable/9/sys/dev/vge/if_vge.c
stable/9/sys/dev/vr/if_vr.c
stable/9/sys/dev/vte/if_vte.c
stable/9/sys/dev/wb/if_wb.c
stable/9/sys/dev/xen/pcifront/pcifront.c
stable/9/sys/dev/xl/if_xl.c
stable/9/sys/dev/xl/xlphy.c
stable/9/sys/i386/i386/legacy.c
stable/9/sys/isa/vga_isa.c
stable/9/sys/mips/adm5120/admpci.c
stable/9/sys/mips/atheros/apb.c
stable/9/sys/mips/atheros/ar71xx_ehci.c
stable/9/sys/mips/atheros/ar71xx_ohci.c
stable/9/sys/mips/atheros/ar71xx_pci.c
stable/9/sys/mips/atheros/ar724x_pci.c
stable/9/sys/mips/atheros/if_arge.c
stable/9/sys/mips/cavium/octopci.c
stable/9/sys/mips/cavium/usb/octusb_octeon.c
stable/9/sys/mips/idt/idtpci.c
stable/9/sys/mips/idt/if_kr.c
stable/9/sys/mips/malta/gt.c
stable/9/sys/mips/malta/gt_pci.c
stable/9/sys/mips/nlm/xlp_pci.c
stable/9/sys/mips/rmi/dev/nlge/if_nlge.c
stable/9/sys/mips/rmi/dev/sec/rmisec.c
stable/9/sys/mips/rmi/xlr_pci.c
stable/9/sys/mips/rmi/xls_ehci.c
stable/9/sys/mips/rt305x/rt305x_dotg.c
stable/9/sys/pci/if_rl.c
stable/9/sys/pci/intpm.c
stable/9/sys/pci/viapm.c
stable/9/sys/powerpc/aim/nexus.c
stable/9/sys/powerpc/mambo/mambo.c
stable/9/sys/powerpc/mpc85xx/nexus.c
stable/9/sys/powerpc/mpc85xx/pci_fdt.c
stable/9/sys/powerpc/ofw/ofw_cpu.c
stable/9/sys/powerpc/ofw/ofw_pcib_pci.c
stable/9/sys/powerpc/powermac/cpcht.c
stable/9/sys/powerpc/powermac/cuda.c
stable/9/sys/powerpc/powermac/grackle.c
stable/9/sys/powerpc/powermac/pmu.c
stable/9/sys/powerpc/powermac/uninorthpci.c
stable/9/sys/powerpc/ps3/ehci_ps3.c
stable/9/sys/powerpc/ps3/ohci_ps3.c
stable/9/sys/powerpc/ps3/ps3bus.c
stable/9/sys/sparc64/central/central.c
stable/9/sys/sparc64/ebus/ebus.c
stable/9/sys/sparc64/ebus/epic.c
stable/9/sys/sparc64/fhc/fhc.c
stable/9/sys/sparc64/pci/apb.c
stable/9/sys/sparc64/pci/fire.c
stable/9/sys/sparc64/pci/ofw_pcib.c
stable/9/sys/sparc64/pci/ofw_pcibus.c
stable/9/sys/sparc64/pci/psycho.c
stable/9/sys/sparc64/pci/sbbc.c
stable/9/sys/sparc64/pci/schizo.c
stable/9/sys/sparc64/sbus/dma_sbus.c
stable/9/sys/sparc64/sbus/sbus.c
stable/9/sys/sparc64/sparc64/eeprom.c
stable/9/sys/sparc64/sparc64/jbusppm.c
stable/9/sys/sparc64/sparc64/nexus.c
stable/9/sys/sparc64/sparc64/rtc.c
stable/9/sys/sparc64/sparc64/sc_machdep.c
stable/9/sys/sparc64/sparc64/schppm.c
stable/9/sys/sparc64/sparc64/ssm.c
stable/9/sys/sparc64/sparc64/upa.c
stable/9/sys/x86/pci/pci_bus.c
stable/9/sys/x86/pci/qpi.c
stable/9/sys/x86/x86/mptable_pci.c
stable/9/sys/xen/xenstore/xenstore.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/amd64/amd64/legacy.c
==============================================================================
--- stable/9/sys/amd64/amd64/legacy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/amd64/amd64/legacy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -237,19 +237,17 @@ static device_method_t cpu_methods[] = {
/* Bus interface */
DEVMETHOD(bus_add_child, cpu_add_child),
DEVMETHOD(bus_read_ivar, cpu_read_ivar),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource),
DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
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 cpu_driver = {
Modified: stable/9/sys/arm/econa/ehci_ebus.c
==============================================================================
--- stable/9/sys/arm/econa/ehci_ebus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/econa/ehci_ebus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -281,10 +281,7 @@ static device_method_t ehci_methods[] =
DEVMETHOD(device_resume, ehci_ebus_resume),
DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
- /* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
-
- {0, 0}
+ DEVMETHOD_END
};
static driver_t ehci_driver = {
Modified: stable/9/sys/arm/econa/ohci_ec.c
==============================================================================
--- stable/9/sys/arm/econa/ohci_ec.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/econa/ohci_ec.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -222,10 +222,7 @@ static device_method_t ohci_methods[] =
DEVMETHOD(device_detach, ohci_ec_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- /* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
-
- {0, 0}
+ DEVMETHOD_END
};
static driver_t ohci_driver = {
Modified: stable/9/sys/arm/mv/mv_pci.c
==============================================================================
--- stable/9/sys/arm/mv/mv_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/mv/mv_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -171,7 +171,6 @@ static device_method_t mv_pcib_methods[]
DEVMETHOD(device_attach, mv_pcib_attach),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, mv_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, mv_pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, mv_pcib_alloc_resource),
@@ -194,7 +193,7 @@ static device_method_t mv_pcib_methods[]
DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t mv_pcib_driver = {
Modified: stable/9/sys/arm/xscale/i80321/i80321_pci.c
==============================================================================
--- stable/9/sys/arm/xscale/i80321/i80321_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/xscale/i80321/i80321_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -373,7 +373,6 @@ static device_method_t i80321_pci_method
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, i80321_read_ivar),
DEVMETHOD(bus_write_ivar, i80321_write_ivar),
DEVMETHOD(bus_alloc_resource, i80321_pci_alloc_resource),
@@ -389,7 +388,7 @@ static device_method_t i80321_pci_method
DEVMETHOD(pcib_write_config, i80321_pci_write_config),
DEVMETHOD(pcib_route_interrupt, machdep_pci_route_interrupt),
- {0, 0}
+ DEVMETHOD_END
};
static driver_t i80321_pci_driver = {
Modified: stable/9/sys/arm/xscale/i8134x/i81342_pci.c
==============================================================================
--- stable/9/sys/arm/xscale/i8134x/i81342_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/xscale/i8134x/i81342_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -516,7 +516,6 @@ static device_method_t i81342_pci_method
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, i81342_read_ivar),
DEVMETHOD(bus_write_ivar, i81342_write_ivar),
DEVMETHOD(bus_alloc_resource, i81342_pci_alloc_resource),
@@ -532,7 +531,7 @@ static device_method_t i81342_pci_method
DEVMETHOD(pcib_write_config, i81342_pci_write_config),
DEVMETHOD(pcib_route_interrupt, i81342_pci_route_interrupt),
- {0, 0}
+ DEVMETHOD_END
};
static driver_t i81342_pci_driver = {
Modified: stable/9/sys/arm/xscale/ixp425/ixp425_pci.c
==============================================================================
--- stable/9/sys/arm/xscale/ixp425/ixp425_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/arm/xscale/ixp425/ixp425_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -445,7 +445,6 @@ static device_method_t ixppcib_methods[]
DEVMETHOD(device_attach, ixppcib_attach),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, ixppcib_read_ivar),
DEVMETHOD(bus_write_ivar, ixppcib_write_ivar),
DEVMETHOD(bus_setup_intr, ixppcib_setup_intr),
@@ -462,7 +461,7 @@ static device_method_t ixppcib_methods[]
DEVMETHOD(pcib_write_config, ixppcib_write_config),
DEVMETHOD(pcib_route_interrupt, ixppcib_route_interrupt),
- {0, 0},
+ DEVMETHOD_END
};
static driver_t ixppcib_driver = {
Modified: stable/9/sys/dev/aac/aac_pci.c
==============================================================================
--- stable/9/sys/dev/aac/aac_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/aac/aac_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -68,9 +68,7 @@ static device_method_t aac_methods[] = {
DEVMETHOD(device_suspend, aac_suspend),
DEVMETHOD(device_resume, aac_resume),
- 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 = {
Modified: stable/9/sys/dev/acpi_support/acpi_wmi.c
==============================================================================
--- stable/9/sys/dev/acpi_support/acpi_wmi.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/acpi_support/acpi_wmi.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -175,7 +175,6 @@ static device_method_t acpi_wmi_methods[
/* bus interface */
DEVMETHOD(bus_add_child, bus_generic_add_child),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
/* acpi_wmi interface */
DEVMETHOD(acpi_wmi_provides_guid_string,
@@ -189,7 +188,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 = {
Modified: stable/9/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_cpu.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/acpica/acpi_cpu.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -187,13 +187,12 @@ static device_method_t acpi_cpu_methods[
DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource),
DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
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_driver = {
Modified: stable/9/sys/dev/acpica/acpi_isab.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_isab.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/acpica/acpi_isab.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -68,7 +68,6 @@ static device_method_t acpi_isab_methods
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_isab_read_ivar),
DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
@@ -77,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 = {
Modified: stable/9/sys/dev/acpica/acpi_pcib_acpi.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_pcib_acpi.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/acpica/acpi_pcib_acpi.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -106,7 +106,6 @@ static device_method_t acpi_pcib_acpi_me
DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource),
@@ -133,7 +132,7 @@ static device_method_t acpi_pcib_acpi_me
DEVMETHOD(pcib_map_msi, acpi_pcib_map_msi),
DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep),
- {0, 0}
+ DEVMETHOD_END
};
static devclass_t pcib_devclass;
Modified: stable/9/sys/dev/amr/amr_pci.c
==============================================================================
--- stable/9/sys/dev/amr/amr_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/amr/amr_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -106,9 +106,7 @@ static device_method_t amr_methods[] = {
DEVMETHOD(device_suspend, amr_pci_suspend),
DEVMETHOD(device_resume, amr_pci_resume),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t amr_pci_driver = {
Modified: stable/9/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- stable/9/sys/dev/arcmsr/arcmsr.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/arcmsr/arcmsr.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -70,8 +70,11 @@
** 1.20.00.21 03/03/2011 Ching Huang
if a command timeout, then wait its ccb back before free it
** 1.20.00.22 07/04/2011 Ching Huang
Fixed multiple MTX panic
******************************************************************************************
-* $FreeBSD$
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#if 0
#define ARCMSR_DEBUG1 1
#endif
@@ -223,9 +226,8 @@ static device_method_t arcmsr_methods[]=
DEVMETHOD(device_shutdown, arcmsr_shutdown),
DEVMETHOD(device_suspend, arcmsr_suspend),
DEVMETHOD(device_resume, arcmsr_resume),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
- { 0, 0 }
+
+ DEVMETHOD_END
};
static driver_t arcmsr_driver={
Modified: stable/9/sys/dev/bce/if_bce.c
==============================================================================
--- stable/9/sys/dev/bce/if_bce.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/bce/if_bce.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -455,10 +455,6 @@ static device_method_t bce_methods[] = {
/* DEVMETHOD(device_resume, bce_resume), */
/* DEVMETHOD(device_quiesce, bce_quiesce), */
- /* Bus interface (bus_if.h) */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface (miibus_if.h) */
DEVMETHOD(miibus_readreg, bce_miibus_read_reg),
DEVMETHOD(miibus_writereg, bce_miibus_write_reg),
@@ -467,7 +463,7 @@ static device_method_t bce_methods[] = {
/* DEVMETHOD(miibus_linkchg, bce_miibus_linkchg), */
/* DEVMETHOD(miibus_mediainit, bce_miibus_mediainit), */
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t bce_driver = {
Modified: stable/9/sys/dev/bfe/if_bfe.c
==============================================================================
--- stable/9/sys/dev/bfe/if_bfe.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/bfe/if_bfe.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -137,16 +137,12 @@ static device_method_t bfe_methods[] = {
DEVMETHOD(device_suspend, bfe_suspend),
DEVMETHOD(device_resume, bfe_resume),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, bfe_miibus_readreg),
DEVMETHOD(miibus_writereg, bfe_miibus_writereg),
DEVMETHOD(miibus_statchg, bfe_miibus_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t bfe_driver = {
Modified: stable/9/sys/dev/bge/if_bge.c
==============================================================================
--- stable/9/sys/dev/bge/if_bge.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/bge/if_bge.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -490,16 +490,12 @@ static device_method_t bge_methods[] = {
DEVMETHOD(device_suspend, bge_suspend),
DEVMETHOD(device_resume, bge_resume),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, bge_miibus_readreg),
DEVMETHOD(miibus_writereg, bge_miibus_writereg),
DEVMETHOD(miibus_statchg, bge_miibus_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t bge_driver = {
Modified: stable/9/sys/dev/bm/if_bm.c
==============================================================================
--- stable/9/sys/dev/bm/if_bm.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/bm/if_bm.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -135,15 +135,12 @@ static device_method_t bm_methods[] = {
DEVMETHOD(device_detach, bm_detach),
DEVMETHOD(device_shutdown, bm_shutdown),
- /* bus interface, for miibus */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, bm_miibus_readreg),
DEVMETHOD(miibus_writereg, bm_miibus_writereg),
DEVMETHOD(miibus_statchg, bm_miibus_statchg),
- { 0, 0 }
+
+ DEVMETHOD_END
};
static driver_t bm_macio_driver = {
Modified: stable/9/sys/dev/bwn/if_bwn.c
==============================================================================
--- stable/9/sys/dev/bwn/if_bwn.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/bwn/if_bwn.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -14225,7 +14225,7 @@ static device_method_t bwn_methods[] = {
DEVMETHOD(device_detach, bwn_detach),
DEVMETHOD(device_suspend, bwn_suspend),
DEVMETHOD(device_resume, bwn_resume),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t bwn_driver = {
"bwn",
Modified: stable/9/sys/dev/bxe/if_bxe.c
==============================================================================
--- stable/9/sys/dev/bxe/if_bxe.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/bxe/if_bxe.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -400,11 +400,7 @@ static device_method_t bxe_methods[] = {
DEVMETHOD(device_detach, bxe_detach),
DEVMETHOD(device_shutdown, bxe_shutdown),
- /* Bus interface (bus_if.h) */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
- KOBJMETHOD_END
+ DEVMETHOD_END
};
Modified: stable/9/sys/dev/cas/if_cas.c
==============================================================================
--- stable/9/sys/dev/cas/if_cas.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/cas/if_cas.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -2600,16 +2600,12 @@ static device_method_t cas_pci_methods[]
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, cas_pci_suspend),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, cas_mii_readreg),
DEVMETHOD(miibus_writereg, cas_mii_writereg),
DEVMETHOD(miibus_statchg, cas_mii_statchg),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t cas_pci_driver = {
Modified: stable/9/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/9/sys/dev/cxgb/cxgb_main.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/cxgb/cxgb_main.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -129,11 +129,7 @@ static device_method_t cxgb_controller_m
DEVMETHOD(device_attach, cxgb_controller_attach),
DEVMETHOD(device_detach, cxgb_controller_detach),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t cxgb_controller_driver = {
Modified: stable/9/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/9/sys/dev/cxgbe/t4_main.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/cxgbe/t4_main.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -73,11 +73,7 @@ static device_method_t t4_methods[] = {
DEVMETHOD(device_attach, t4_attach),
DEVMETHOD(device_detach, t4_detach),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t t4_driver = {
"t4nex",
Modified: stable/9/sys/dev/dc/dcphy.c
==============================================================================
--- stable/9/sys/dev/dc/dcphy.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/dc/dcphy.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -95,7 +95,7 @@ static device_method_t dcphy_methods[] =
DEVMETHOD(device_attach, dcphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t dcphy_devclass;
Modified: stable/9/sys/dev/dc/if_dc.c
==============================================================================
--- stable/9/sys/dev/dc/if_dc.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/dc/if_dc.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -331,17 +331,13 @@ static device_method_t dc_methods[] = {
DEVMETHOD(device_resume, dc_resume),
DEVMETHOD(device_shutdown, dc_shutdown),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, dc_miibus_readreg),
DEVMETHOD(miibus_writereg, dc_miibus_writereg),
DEVMETHOD(miibus_statchg, dc_miibus_statchg),
DEVMETHOD(miibus_mediainit, dc_miibus_mediainit),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t dc_driver = {
Modified: stable/9/sys/dev/dc/pnphy.c
==============================================================================
--- stable/9/sys/dev/dc/pnphy.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/dc/pnphy.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -74,7 +74,7 @@ static device_method_t pnphy_methods[] =
DEVMETHOD(device_attach, pnphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t pnphy_devclass;
Modified: stable/9/sys/dev/eisa/eisaconf.c
==============================================================================
--- stable/9/sys/dev/eisa/eisaconf.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/eisa/eisaconf.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -557,7 +557,6 @@ static device_method_t eisa_methods[] =
DEVMETHOD(bus_probe_nomatch, eisa_probe_nomatch),
DEVMETHOD(bus_read_ivar, eisa_read_ivar),
DEVMETHOD(bus_write_ivar, eisa_write_ivar),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_alloc_resource, eisa_alloc_resource),
DEVMETHOD(bus_release_resource, eisa_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
@@ -570,7 +569,7 @@ static device_method_t eisa_methods[] =
DEVMETHOD(eisa_add_iospace, eisa_add_iospace_m),
DEVMETHOD(eisa_add_mspace, eisa_add_mspace_m),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t eisa_driver = {
Modified: stable/9/sys/dev/esp/esp_pci.c
==============================================================================
--- stable/9/sys/dev/esp/esp_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/esp/esp_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -146,7 +146,7 @@ static device_method_t esp_pci_methods[]
DEVMETHOD(device_suspend, esp_pci_suspend),
DEVMETHOD(device_resume, esp_pci_resume),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t esp_pci_driver = {
Modified: stable/9/sys/dev/esp/esp_sbus.c
==============================================================================
--- stable/9/sys/dev/esp/esp_sbus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/esp/esp_sbus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -117,7 +117,7 @@ static device_method_t esp_dma_methods[]
DEVMETHOD(device_suspend, esp_suspend),
DEVMETHOD(device_resume, esp_resume),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t esp_dma_driver = {
@@ -136,7 +136,7 @@ static device_method_t esp_sbus_methods[
DEVMETHOD(device_suspend, esp_suspend),
DEVMETHOD(device_resume, esp_resume),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t esp_sbus_driver = {
Modified: stable/9/sys/dev/et/if_et.c
==============================================================================
--- stable/9/sys/dev/et/if_et.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/et/if_et.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -170,14 +170,11 @@ static device_method_t et_methods[] = {
DEVMETHOD(device_detach, et_detach),
DEVMETHOD(device_shutdown, et_shutdown),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
DEVMETHOD(miibus_readreg, et_miibus_readreg),
DEVMETHOD(miibus_writereg, et_miibus_writereg),
DEVMETHOD(miibus_statchg, et_miibus_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t et_driver = {
Modified: stable/9/sys/dev/fb/fb.c
==============================================================================
--- stable/9/sys/dev/fb/fb.c Sat Dec 31 14:04:54 2011 (r229092)
+++ stable/9/sys/dev/fb/fb.c Sat Dec 31 14:12:12 2011 (r229093)
@@ -315,8 +315,7 @@ static device_method_t fb_methods[] = {
DEVMETHOD(device_probe, fbprobe),
DEVMETHOD(device_attach, fbattach),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t fb_driver = {
Modified: stable/9/sys/dev/firewire/firewire.c
==============================================================================
--- stable/9/sys/dev/firewire/firewire.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/firewire/firewire.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -30,11 +30,11 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
@@ -128,9 +128,8 @@ static device_method_t firewire_methods[
/* Bus interface */
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",
Modified: stable/9/sys/dev/firewire/fwohci_pci.c
==============================================================================
--- stable/9/sys/dev/firewire/fwohci_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/firewire/fwohci_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -30,10 +30,11 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#define BOUNCE_BUFFER_TEST 0
#include <sys/param.h>
@@ -536,9 +537,8 @@ static device_method_t fwohci_methods[]
/* Bus interface */
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 = {
Modified: stable/9/sys/dev/gem/if_gem_pci.c
==============================================================================
--- stable/9/sys/dev/gem/if_gem_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/gem/if_gem_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -82,16 +82,12 @@ static device_method_t gem_pci_methods[]
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, gem_pci_suspend),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, gem_mii_readreg),
DEVMETHOD(miibus_writereg, gem_mii_writereg),
DEVMETHOD(miibus_statchg, gem_mii_statchg),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t gem_pci_driver = {
Modified: stable/9/sys/dev/gem/if_gem_sbus.c
==============================================================================
--- stable/9/sys/dev/gem/if_gem_sbus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/gem/if_gem_sbus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -78,16 +78,12 @@ static device_method_t gem_sbus_methods[
/* Use the suspend handler here, it is all that is required. */
DEVMETHOD(device_shutdown, gem_sbus_suspend),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, gem_mii_readreg),
DEVMETHOD(miibus_writereg, gem_mii_writereg),
DEVMETHOD(miibus_statchg, gem_mii_statchg),
- KOBJMETHOD_END
+ DEVMETHOD_END
};
static driver_t gem_sbus_driver = {
Modified: stable/9/sys/dev/gpio/gpiobus.c
==============================================================================
--- stable/9/sys/dev/gpio/gpiobus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/gpio/gpiobus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -461,7 +461,6 @@ static device_method_t gpiobus_methods[]
/* Bus interface */
DEVMETHOD(bus_add_child, gpiobus_add_child),
DEVMETHOD(bus_print_child, gpiobus_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_child_pnpinfo_str, gpiobus_child_pnpinfo_str),
DEVMETHOD(bus_child_location_str, gpiobus_child_location_str),
DEVMETHOD(bus_hinted_child, gpiobus_hinted_child),
@@ -478,7 +477,7 @@ static device_method_t gpiobus_methods[]
DEVMETHOD(gpiobus_pin_set, gpiobus_pin_set),
DEVMETHOD(gpiobus_pin_toggle, gpiobus_pin_toggle),
- { 0, 0 }
+ DEVMETHOD_END
};
driver_t gpiobus_driver = {
Modified: stable/9/sys/dev/hifn/hifn7751.c
==============================================================================
--- stable/9/sys/dev/hifn/hifn7751.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/hifn/hifn7751.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -113,16 +113,12 @@ static device_method_t hifn_methods[] =
DEVMETHOD(device_resume, hifn_resume),
DEVMETHOD(device_shutdown, hifn_shutdown),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* crypto device methods */
DEVMETHOD(cryptodev_newsession, hifn_newsession),
DEVMETHOD(cryptodev_freesession,hifn_freesession),
DEVMETHOD(cryptodev_process, hifn_process),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t hifn_driver = {
"hifn",
Modified: stable/9/sys/dev/hme/if_hme_pci.c
==============================================================================
--- stable/9/sys/dev/hme/if_hme_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/hme/if_hme_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -93,16 +93,12 @@ static device_method_t hme_pci_methods[]
/* Can just use the suspend method here. */
DEVMETHOD(device_shutdown, hme_pci_suspend),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, hme_mii_readreg),
DEVMETHOD(miibus_writereg, hme_mii_writereg),
DEVMETHOD(miibus_statchg, hme_mii_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t hme_pci_driver = {
Modified: stable/9/sys/dev/hme/if_hme_sbus.c
==============================================================================
--- stable/9/sys/dev/hme/if_hme_sbus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/hme/if_hme_sbus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -95,16 +95,12 @@ static device_method_t hme_sbus_methods[
/* Can just use the suspend method here. */
DEVMETHOD(device_shutdown, hme_sbus_suspend),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, hme_mii_readreg),
DEVMETHOD(miibus_writereg, hme_mii_writereg),
DEVMETHOD(miibus_statchg, hme_mii_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t hme_sbus_driver = {
Modified: stable/9/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/9/sys/dev/ichsmb/ichsmb_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/ichsmb/ichsmb_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -103,9 +103,6 @@ static device_method_t ichsmb_pci_method
DEVMETHOD(device_attach, ichsmb_pci_attach),
DEVMETHOD(device_detach, ichsmb_detach),
- /* Bus methods */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
-
/* SMBus methods */
DEVMETHOD(smbus_callback, ichsmb_callback),
DEVMETHOD(smbus_quick, ichsmb_quick),
@@ -118,7 +115,8 @@ static device_method_t ichsmb_pci_method
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 = {
Modified: stable/9/sys/dev/ida/ida_pci.c
==============================================================================
--- stable/9/sys/dev/ida/ida_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/ida/ida_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -188,9 +188,7 @@ static device_method_t ida_pci_methods[]
DEVMETHOD(device_attach, ida_pci_attach),
DEVMETHOD(device_detach, ida_detach),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
-
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ida_pci_driver = {
Modified: stable/9/sys/dev/if_ndis/if_ndis_usb.c
==============================================================================
--- stable/9/sys/dev/if_ndis/if_ndis_usb.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/if_ndis/if_ndis_usb.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -91,11 +91,9 @@ static device_method_t ndis_methods[] =
DEVMETHOD(device_shutdown, ndis_shutdown),
/* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- 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 = {
Modified: stable/9/sys/dev/iicbus/iicbus.c
==============================================================================
--- stable/9/sys/dev/iicbus/iicbus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/iicbus/iicbus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -245,7 +245,6 @@ static device_method_t iicbus_methods[]
/* bus interface */
DEVMETHOD(bus_add_child, iicbus_add_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_print_child, iicbus_print_child),
DEVMETHOD(bus_probe_nomatch, iicbus_probe_nomatch),
DEVMETHOD(bus_read_ivar, iicbus_read_ivar),
@@ -256,7 +255,7 @@ static device_method_t iicbus_methods[]
/* iicbus interface */
DEVMETHOD(iicbus_transfer, iicbus_transfer),
- { 0, 0 }
+ DEVMETHOD_END
};
driver_t iicbus_driver = {
Modified: stable/9/sys/dev/iicbus/iicsmb.c
==============================================================================
--- stable/9/sys/dev/iicbus/iicsmb.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/iicbus/iicsmb.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -22,11 +22,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD$
- *
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
/*
* I2C to SMB bridge
*
@@ -106,10 +106,6 @@ static device_method_t iicsmb_methods[]
DEVMETHOD(device_attach, iicsmb_attach),
DEVMETHOD(device_detach, iicsmb_detach),
- /* bus interface */
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
-
/* iicbus interface */
DEVMETHOD(iicbus_intr, iicsmb_intr),
@@ -125,8 +121,8 @@ static device_method_t iicsmb_methods[]
DEVMETHOD(smbus_pcall, iicsmb_pcall),
DEVMETHOD(smbus_bwrite, iicsmb_bwrite),
DEVMETHOD(smbus_bread, iicsmb_bread),
-
- { 0, 0 }
+
+ DEVMETHOD_END
};
static driver_t iicsmb_driver = {
Modified: stable/9/sys/dev/lge/if_lge.c
==============================================================================
--- stable/9/sys/dev/lge/if_lge.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/lge/if_lge.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -170,16 +170,12 @@ static device_method_t lge_methods[] = {
DEVMETHOD(device_detach, lge_detach),
DEVMETHOD(device_shutdown, lge_shutdown),
- /* bus interface */
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
-
/* MII interface */
DEVMETHOD(miibus_readreg, lge_miibus_readreg),
DEVMETHOD(miibus_writereg, lge_miibus_writereg),
DEVMETHOD(miibus_statchg, lge_miibus_statchg),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t lge_driver = {
Modified: stable/9/sys/dev/mca/mca_bus.c
==============================================================================
--- stable/9/sys/dev/mca/mca_bus.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mca/mca_bus.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -507,7 +507,6 @@ static device_method_t mca_methods[] = {
DEVMETHOD(bus_probe_nomatch, mca_probe_nomatch),
DEVMETHOD(bus_read_ivar, mca_read_ivar),
DEVMETHOD(bus_write_ivar, bus_generic_write_ivar),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
@@ -520,7 +519,7 @@ static device_method_t mca_methods[] = {
DEVMETHOD(bus_activate_resource,bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t mca_driver = {
Modified: stable/9/sys/dev/mfi/mfi_pci.c
==============================================================================
--- stable/9/sys/dev/mfi/mfi_pci.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mfi/mfi_pci.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -92,9 +92,8 @@ static device_method_t mfi_methods[] = {
DEVMETHOD(device_detach, mfi_pci_detach),
DEVMETHOD(device_suspend, mfi_pci_suspend),
DEVMETHOD(device_resume, mfi_pci_resume),
- DEVMETHOD(bus_print_child, bus_generic_print_child),
- DEVMETHOD(bus_driver_added, bus_generic_driver_added),
- { 0, 0 }
+
+ DEVMETHOD_END
};
static driver_t mfi_pci_driver = {
Modified: stable/9/sys/dev/mii/acphy.c
==============================================================================
--- stable/9/sys/dev/mii/acphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/acphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -87,7 +87,7 @@ static device_method_t acphy_methods[] =
DEVMETHOD(device_attach, acphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t acphy_devclass;
Modified: stable/9/sys/dev/mii/amphy.c
==============================================================================
--- stable/9/sys/dev/mii/amphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/amphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -66,7 +66,7 @@ static device_method_t amphy_methods[] =
DEVMETHOD(device_attach, amphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t amphy_devclass;
Modified: stable/9/sys/dev/mii/atphy.c
==============================================================================
--- stable/9/sys/dev/mii/atphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/atphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -59,7 +59,7 @@ static device_method_t atphy_methods[] =
DEVMETHOD(device_attach, atphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { NULL, NULL }
+ DEVMETHOD_END
};
static devclass_t atphy_devclass;
Modified: stable/9/sys/dev/mii/axphy.c
==============================================================================
--- stable/9/sys/dev/mii/axphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/axphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -56,7 +56,7 @@ static device_method_t axphy_methods[] =
DEVMETHOD(device_attach, axphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t axphy_devclass;
Modified: stable/9/sys/dev/mii/bmtphy.c
==============================================================================
--- stable/9/sys/dev/mii/bmtphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/bmtphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -91,8 +91,7 @@ static device_method_t bmtphy_methods[]
DEVMETHOD(device_attach, bmtphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
-
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t bmtphy_devclass;
Modified: stable/9/sys/dev/mii/brgphy.c
==============================================================================
--- stable/9/sys/dev/mii/brgphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/brgphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -82,7 +82,7 @@ static device_method_t brgphy_methods[]
DEVMETHOD(device_attach, brgphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t brgphy_devclass;
Modified: stable/9/sys/dev/mii/ciphy.c
==============================================================================
--- stable/9/sys/dev/mii/ciphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/ciphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -67,7 +67,7 @@ static device_method_t ciphy_methods[] =
DEVMETHOD(device_attach, ciphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t ciphy_devclass;
Modified: stable/9/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/9/sys/dev/mii/e1000phy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/e1000phy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -71,7 +71,7 @@ static device_method_t e1000phy_methods[
DEVMETHOD(device_attach, e1000phy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t e1000phy_devclass;
Modified: stable/9/sys/dev/mii/gentbi.c
==============================================================================
--- stable/9/sys/dev/mii/gentbi.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/gentbi.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -95,7 +95,7 @@ static device_method_t gentbi_methods[]
DEVMETHOD(device_attach, gentbi_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- {0, 0}
+ DEVMETHOD_END
};
static devclass_t gentbi_devclass;
Modified: stable/9/sys/dev/mii/icsphy.c
==============================================================================
--- stable/9/sys/dev/mii/icsphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/icsphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -89,7 +89,7 @@ static device_method_t icsphy_methods[]
DEVMETHOD(device_attach, icsphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t icsphy_devclass;
Modified: stable/9/sys/dev/mii/ip1000phy.c
==============================================================================
--- stable/9/sys/dev/mii/ip1000phy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/ip1000phy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -63,7 +63,7 @@ static device_method_t ip1000phy_methods
DEVMETHOD(device_attach, ip1000phy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { 0, 0 }
+ DEVMETHOD_END
};
static devclass_t ip1000phy_devclass;
Modified: stable/9/sys/dev/mii/jmphy.c
==============================================================================
--- stable/9/sys/dev/mii/jmphy.c Sat Dec 31 14:04:54 2011
(r229092)
+++ stable/9/sys/dev/mii/jmphy.c Sat Dec 31 14:12:12 2011
(r229093)
@@ -62,7 +62,7 @@ static device_method_t jmphy_methods[] =
DEVMETHOD(device_attach, jmphy_attach),
DEVMETHOD(device_detach, mii_phy_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- { NULL, NULL }
+ DEVMETHOD_END
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
