diff options
Diffstat (limited to 'sys/dev')
103 files changed, 157 insertions, 410 deletions
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c index 6f59e68..485d5ff 100644 --- a/sys/dev/aac/aac_pci.c +++ b/sys/dev/aac/aac_pci.c @@ -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 = { diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c index b0ddd6e..16c2dd8 100644 --- a/sys/dev/acpi_support/acpi_wmi.c +++ b/sys/dev/acpi_support/acpi_wmi.c @@ -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 = { diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index d26903d..29034e1 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -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 = { diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index 0da0182..3febea7 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -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 = { diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 3284fc5..d0aff3b 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -106,7 +106,6 @@ static device_method_t acpi_pcib_acpi_methods[] = { 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_methods[] = { 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; diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index d72a129..b10c65f 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -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 = { diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 10bb504..b672176 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -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={ diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 39a93aa..e0014c8 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -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 = { diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c index 7f970f4..6dd33cd 100644 --- a/sys/dev/bfe/if_bfe.c +++ b/sys/dev/bfe/if_bfe.c @@ -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 = { diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index f7d1730..69d831d 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -493,16 +493,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 = { diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c index c478e7b..872da6d 100644 --- a/sys/dev/bm/if_bm.c +++ b/sys/dev/bm/if_bm.c @@ -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 = { diff --git a/sys/dev/bxe/if_bxe.c b/sys/dev/bxe/if_bxe.c index 9957359..6ccd045 100644 --- a/sys/dev/bxe/if_bxe.c +++ b/sys/dev/bxe/if_bxe.c @@ -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 }; diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c index 858c8bc..894f466 100644 --- a/sys/dev/cas/if_cas.c +++ b/sys/dev/cas/if_cas.c @@ -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 = { diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c index 54bb8e3..5d67fc6 100644 --- a/sys/dev/cesa/cesa.c +++ b/sys/dev/cesa/cesa.c @@ -93,16 +93,12 @@ static device_method_t cesa_methods[] = { DEVMETHOD(device_attach, cesa_attach), DEVMETHOD(device_detach, cesa_detach), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* Crypto device methods */ DEVMETHOD(cryptodev_newsession, cesa_newsession), DEVMETHOD(cryptodev_freesession,cesa_freesession), DEVMETHOD(cryptodev_process, cesa_process), - { 0, 0 } + DEVMETHOD_END }; static driver_t cesa_driver = { diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index ae32221..c5d46a0 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -129,11 +129,7 @@ static device_method_t cxgb_controller_methods[] = { 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 = { diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index b7cb09a..adca421 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -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", diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index b9ea19a..0ace34e 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -337,17 +337,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 = { diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 689efb6..8ec3419 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -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 = { diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c index 539224a..f91a852 100644 --- a/sys/dev/et/if_et.c +++ b/sys/dev/et/if_et.c @@ -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 = { diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c index b201d29..183e20c 100644 --- a/sys/dev/fb/fb.c +++ b/sys/dev/fb/fb.c @@ -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 = { diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 490f39b..aa0f1aa 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -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", diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index 0bb66a9..979f587 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -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 = { diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c index c5e1acd..a3376fd 100644 --- a/sys/dev/gem/if_gem_pci.c +++ b/sys/dev/gem/if_gem_pci.c @@ -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 = { diff --git a/sys/dev/gem/if_gem_sbus.c b/sys/dev/gem/if_gem_sbus.c index 205285d..4265b8c 100644 --- a/sys/dev/gem/if_gem_sbus.c +++ b/sys/dev/gem/if_gem_sbus.c @@ -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 = { diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 54644a2..7167daa 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -458,7 +458,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), @@ -475,7 +474,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 = { diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c index 2da5a9e..7e3a65f 100644 --- a/sys/dev/hifn/hifn7751.c +++ b/sys/dev/hifn/hifn7751.c @@ -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", diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c index 9f68df2..d114fd8 100644 --- a/sys/dev/hme/if_hme_pci.c +++ b/sys/dev/hme/if_hme_pci.c @@ -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 = { diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c index 846ee11..946597e 100644 --- a/sys/dev/hme/if_hme_sbus.c +++ b/sys/dev/hme/if_hme_sbus.c @@ -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 = { diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index 48d6eb6..d4fb777 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -103,9 +103,6 @@ static device_method_t ichsmb_pci_methods[] = { 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_methods[] = { DEVMETHOD(smbus_pcall, ichsmb_pcall), DEVMETHOD(smbus_bwrite, ichsmb_bwrite), DEVMETHOD(smbus_bread, ichsmb_bread), - { 0, 0 } + + DEVMETHOD_END }; static driver_t ichsmb_pci_driver = { diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index c33e235..e71c6d4 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -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 = { diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c index b872f9a..21fac0d 100644 --- a/sys/dev/if_ndis/if_ndis_usb.c +++ b/sys/dev/if_ndis/if_ndis_usb.c @@ -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 = { diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index ca110c8..121b25b 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -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 = { diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c index 10229ac..27f1d2b 100644 --- a/sys/dev/iicbus/iicsmb.c +++ b/sys/dev/iicbus/iicsmb.c @@ -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 = { diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c index c4ddef8..6f69a0a 100644 --- a/sys/dev/lge/if_lge.c +++ b/sys/dev/lge/if_lge.c @@ -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 = { diff --git a/sys/dev/mca/mca_bus.c b/sys/dev/mca/mca_bus.c index d3f9313..2b4a0b5 100644 --- a/sys/dev/mca/mca_bus.c +++ b/sys/dev/mca/mca_bus.c @@ -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 = { diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 8de2e12..952ab1a 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -93,9 +93,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 = { diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index 2c99bc0..2f07e93 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -82,7 +82,6 @@ static device_method_t miibus_methods[] = { /* bus interface */ DEVMETHOD(bus_print_child, miibus_print_child), DEVMETHOD(bus_read_ivar, miibus_read_ivar), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), DEVMETHOD(bus_child_pnpinfo_str, miibus_child_pnpinfo_str), DEVMETHOD(bus_child_location_str, miibus_child_location_str), DEVMETHOD(bus_hinted_child, miibus_hinted_child), @@ -94,7 +93,7 @@ static device_method_t miibus_methods[] = { DEVMETHOD(miibus_linkchg, miibus_linkchg), DEVMETHOD(miibus_mediainit, miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; devclass_t miibus_devclass; diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c index b39a6b8..00d0fe2 100644 --- a/sys/dev/mlx/mlx_pci.c +++ b/sys/dev/mlx/mlx_pci.c @@ -61,9 +61,7 @@ static device_method_t mlx_methods[] = { DEVMETHOD(device_suspend, mlx_suspend), DEVMETHOD(device_resume, mlx_resume), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t mlx_pci_driver = { diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c index 2c57286..9b27488 100644 --- a/sys/dev/mps/mps_pci.c +++ b/sys/dev/mps/mps_pci.c @@ -78,9 +78,8 @@ static device_method_t mps_methods[] = { DEVMETHOD(device_detach, mps_pci_detach), DEVMETHOD(device_suspend, mps_pci_suspend), DEVMETHOD(device_resume, mps_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 mps_pci_driver = { diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 36407a2..588eb8d 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -334,11 +334,7 @@ static device_method_t mskc_methods[] = { DEVMETHOD(device_resume, mskc_resume), DEVMETHOD(device_shutdown, mskc_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - - { NULL, NULL } + DEVMETHOD_END }; static driver_t mskc_driver = { @@ -356,16 +352,12 @@ static device_method_t msk_methods[] = { DEVMETHOD(device_detach, msk_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, msk_miibus_readreg), DEVMETHOD(miibus_writereg, msk_miibus_writereg), DEVMETHOD(miibus_statchg, msk_miibus_statchg), - { NULL, NULL } + DEVMETHOD_END }; static driver_t msk_driver = { diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 3c36fe7..f4c5bed 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -165,16 +165,12 @@ static device_method_t nfe_methods[] = { DEVMETHOD(device_resume, nfe_resume), DEVMETHOD(device_shutdown, nfe_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, nfe_miibus_readreg), DEVMETHOD(miibus_writereg, nfe_miibus_writereg), DEVMETHOD(miibus_statchg, nfe_miibus_statchg), - { NULL, NULL } + DEVMETHOD_END }; static driver_t nfe_driver = { diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 3d7ad63..05eec99 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -223,16 +223,12 @@ static device_method_t nge_methods[] = { DEVMETHOD(device_suspend, nge_suspend), DEVMETHOD(device_resume, nge_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, nge_miibus_readreg), DEVMETHOD(miibus_writereg, nge_miibus_writereg), DEVMETHOD(miibus_statchg, nge_miibus_statchg), - { NULL, NULL } + DEVMETHOD_END }; static driver_t nge_driver = { diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c index 1428662..5c53239 100644 --- a/sys/dev/nve/if_nve.c +++ b/sys/dev/nve/if_nve.c @@ -184,15 +184,11 @@ static device_method_t nve_methods[] = { DEVMETHOD(device_detach, nve_detach), DEVMETHOD(device_shutdown, nve_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, nve_miibus_readreg), DEVMETHOD(miibus_writereg, nve_miibus_writereg), - {0, 0} + DEVMETHOD_END }; static driver_t nve_driver = { diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c index fb45e64..fa990e0 100644 --- a/sys/dev/pccbb/pccbb_isa.c +++ b/sys/dev/pccbb/pccbb_isa.c @@ -211,7 +211,6 @@ static device_method_t cbb_methods[] = { DEVMETHOD(device_resume, cbb_resume), /* bus methods */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, cbb_read_ivar), DEVMETHOD(bus_write_ivar, cbb_write_ivar), DEVMETHOD(bus_alloc_resource, cbb_alloc_resource), @@ -232,7 +231,7 @@ static device_method_t cbb_methods[] = { DEVMETHOD(power_enable_socket, cbb_power_enable_socket), DEVMETHOD(power_disable_socket, cbb_power_disable_socket), - {0,0} + DEVMETHOD_END }; static driver_t cbb_isa_driver = { diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index 6cdc4e4..eca5ed7 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -822,7 +822,6 @@ static device_method_t cbb_methods[] = { DEVMETHOD(device_resume, cbb_resume), /* bus methods */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, cbb_read_ivar), DEVMETHOD(bus_write_ivar, cbb_write_ivar), DEVMETHOD(bus_alloc_resource, cbb_alloc_resource), @@ -849,7 +848,7 @@ static device_method_t cbb_methods[] = { DEVMETHOD(pcib_write_config, cbb_write_config), DEVMETHOD(pcib_route_interrupt, cbb_route_interrupt), - {0,0} + DEVMETHOD_END }; static driver_t cbb_driver = { diff --git a/sys/dev/pci/eisa_pci.c b/sys/dev/pci/eisa_pci.c index 61027a1..98fa270 100644 --- a/sys/dev/pci/eisa_pci.c +++ b/sys/dev/pci/eisa_pci.c @@ -55,7 +55,6 @@ static device_method_t eisab_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -63,7 +62,7 @@ static device_method_t eisab_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t eisab_driver = { diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c index be3f3ac..4f9e2a2 100644 --- a/sys/dev/pci/isa_pci.c +++ b/sys/dev/pci/isa_pci.c @@ -67,7 +67,6 @@ static device_method_t isab_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, isab_pci_alloc_resource), DEVMETHOD(bus_release_resource, isab_pci_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -75,7 +74,7 @@ static device_method_t isab_methods[] = { DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; struct isab_pci_resource { diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index fa14816..d624104 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -67,7 +67,6 @@ static device_method_t pcib_methods[] = { DEVMETHOD(device_resume, pcib_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, pcib_read_ivar), DEVMETHOD(bus_write_ivar, pcib_write_ivar), DEVMETHOD(bus_alloc_resource, pcib_alloc_resource), @@ -95,7 +94,7 @@ static device_method_t pcib_methods[] = { DEVMETHOD(pcib_map_msi, pcib_map_msi), DEVMETHOD(pcib_power_for_sleep, pcib_power_for_sleep), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pcib_devclass; diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c index 2ebd35c..de072ad 100644 --- a/sys/dev/pcn/if_pcn.c +++ b/sys/dev/pcn/if_pcn.c @@ -173,16 +173,12 @@ static device_method_t pcn_methods[] = { DEVMETHOD(device_detach, pcn_detach), DEVMETHOD(device_shutdown, pcn_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, pcn_miibus_readreg), DEVMETHOD(miibus_writereg, pcn_miibus_writereg), DEVMETHOD(miibus_statchg, pcn_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t pcn_driver = { diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c index 6cf747e..0c85620 100644 --- a/sys/dev/ppbus/lpbb.c +++ b/sys/dev/ppbus/lpbb.c @@ -245,9 +245,6 @@ static device_method_t lpbb_methods[] = { DEVMETHOD(device_probe, lpbb_probe), DEVMETHOD(device_attach, lpbb_attach), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* iicbb interface */ DEVMETHOD(iicbb_callback, lpbb_callback), DEVMETHOD(iicbb_setsda, lpbb_setsda), @@ -256,7 +253,7 @@ static device_method_t lpbb_methods[] = { DEVMETHOD(iicbb_getscl, lpbb_getscl), DEVMETHOD(iicbb_reset, lpbb_reset), - { 0, 0 } + DEVMETHOD_END }; static driver_t lpbb_driver = { diff --git a/sys/dev/puc/puc_pccard.c b/sys/dev/puc/puc_pccard.c index 63d5787..370c6af 100644 --- a/sys/dev/puc/puc_pccard.c +++ b/sys/dev/puc/puc_pccard.c @@ -85,8 +85,8 @@ static device_method_t puc_pccard_methods[] = { DEVMETHOD(bus_print_child, puc_bus_print_child), DEVMETHOD(bus_child_pnpinfo_str, puc_bus_child_pnpinfo_str), DEVMETHOD(bus_child_location_str, puc_bus_child_location_str), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t puc_pccard_driver = { diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c index 8c14717..4ad1e3a 100644 --- a/sys/dev/puc/puc_pci.c +++ b/sys/dev/puc/puc_pci.c @@ -135,8 +135,8 @@ static device_method_t puc_pci_methods[] = { DEVMETHOD(bus_print_child, puc_bus_print_child), DEVMETHOD(bus_child_pnpinfo_str, puc_bus_child_pnpinfo_str), DEVMETHOD(bus_child_location_str, puc_bus_child_location_str), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t puc_pci_driver = { diff --git a/sys/dev/quicc/quicc_bfe_fdt.c b/sys/dev/quicc/quicc_bfe_fdt.c index e1fd2d5..382b2a1 100644 --- a/sys/dev/quicc/quicc_bfe_fdt.c +++ b/sys/dev/quicc/quicc_bfe_fdt.c @@ -59,10 +59,8 @@ static device_method_t quicc_fdt_methods[] = { DEVMETHOD(bus_read_ivar, quicc_bus_read_ivar), DEVMETHOD(bus_setup_intr, quicc_bus_setup_intr), DEVMETHOD(bus_teardown_intr, quicc_bus_teardown_intr), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t quicc_fdt_driver = { diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 3ade04c..d911a19 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -313,16 +313,12 @@ static device_method_t re_methods[] = { DEVMETHOD(device_resume, re_resume), DEVMETHOD(device_shutdown, re_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, re_miibus_readreg), DEVMETHOD(miibus_writereg, re_miibus_writereg), DEVMETHOD(miibus_statchg, re_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t re_driver = { diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c index edaf95e..a1667e5 100644 --- a/sys/dev/rt/if_rt.c +++ b/sys/dev/rt/if_rt.c @@ -2588,17 +2588,14 @@ static device_method_t rt_dev_methods[] = DEVMETHOD(device_suspend, rt_suspend), DEVMETHOD(device_resume, rt_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - #ifdef IF_RT_PHY_SUPPORT /* MII interface */ DEVMETHOD(miibus_readreg, rt_miibus_readreg), DEVMETHOD(miibus_writereg, rt_miibus_writereg), DEVMETHOD(miibus_statchg, rt_miibus_statchg), #endif - { 0, 0 } + + DEVMETHOD_END }; static driver_t rt_driver = diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c index 00c00ea..a8fbbbb 100644 --- a/sys/dev/safe/safe.c +++ b/sys/dev/safe/safe.c @@ -99,16 +99,12 @@ static device_method_t safe_methods[] = { DEVMETHOD(device_resume, safe_resume), DEVMETHOD(device_shutdown, safe_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, safe_newsession), DEVMETHOD(cryptodev_freesession,safe_freesession), DEVMETHOD(cryptodev_process, safe_process), - { 0, 0 } + DEVMETHOD_END }; static driver_t safe_driver = { "safe", diff --git a/sys/dev/scc/scc_bfe_ebus.c b/sys/dev/scc/scc_bfe_ebus.c index 6c944f7..2b71a67 100644 --- a/sys/dev/scc/scc_bfe_ebus.c +++ b/sys/dev/scc/scc_bfe_ebus.c @@ -84,9 +84,8 @@ static device_method_t scc_ebus_methods[] = { DEVMETHOD(bus_read_ivar, scc_bus_read_ivar), DEVMETHOD(bus_setup_intr, scc_bus_setup_intr), DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t scc_ebus_driver = { diff --git a/sys/dev/scc/scc_bfe_macio.c b/sys/dev/scc/scc_bfe_macio.c index 1d7bf82..042788d 100644 --- a/sys/dev/scc/scc_bfe_macio.c +++ b/sys/dev/scc/scc_bfe_macio.c @@ -80,9 +80,8 @@ static device_method_t scc_macio_methods[] = { DEVMETHOD(bus_read_ivar, scc_bus_read_ivar), DEVMETHOD(bus_setup_intr, scc_bus_setup_intr), DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t scc_macio_driver = { diff --git a/sys/dev/scc/scc_bfe_quicc.c b/sys/dev/scc/scc_bfe_quicc.c index f92aa52..c7e97f3 100644 --- a/sys/dev/scc/scc_bfe_quicc.c +++ b/sys/dev/scc/scc_bfe_quicc.c @@ -88,9 +88,8 @@ static device_method_t scc_quicc_methods[] = { DEVMETHOD(bus_read_ivar, scc_bus_read_ivar), DEVMETHOD(bus_setup_intr, scc_bus_setup_intr), DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t scc_quicc_driver = { diff --git a/sys/dev/scc/scc_bfe_sbus.c b/sys/dev/scc/scc_bfe_sbus.c index 8eb963f..ba6b25a 100644 --- a/sys/dev/scc/scc_bfe_sbus.c +++ b/sys/dev/scc/scc_bfe_sbus.c @@ -80,9 +80,8 @@ static device_method_t scc_sbus_methods[] = { DEVMETHOD(bus_read_ivar, scc_bus_read_ivar), DEVMETHOD(bus_setup_intr, scc_bus_setup_intr), DEVMETHOD(bus_teardown_intr, scc_bus_teardown_intr), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + + DEVMETHOD_END }; static driver_t scc_sbus_driver = { diff --git a/sys/dev/sec/sec.c b/sys/dev/sec/sec.c index 36fc9ce..3b8c103 100644 --- a/sys/dev/sec/sec.c +++ b/sys/dev/sec/sec.c @@ -135,16 +135,12 @@ static device_method_t sec_methods[] = { DEVMETHOD(device_resume, sec_resume), DEVMETHOD(device_shutdown, sec_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* Crypto methods */ DEVMETHOD(cryptodev_newsession, sec_newsession), DEVMETHOD(cryptodev_freesession,sec_freesession), DEVMETHOD(cryptodev_process, sec_process), - { 0, 0 } + DEVMETHOD_END }; static driver_t sec_driver = { "sec", diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index e919f55..251f310 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -212,16 +212,12 @@ static device_method_t sf_methods[] = { DEVMETHOD(device_suspend, sf_suspend), DEVMETHOD(device_resume, sf_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, sf_miibus_readreg), DEVMETHOD(miibus_writereg, sf_miibus_writereg), DEVMETHOD(miibus_statchg, sf_miibus_statchg), - { NULL, NULL } + DEVMETHOD_END }; static driver_t sf_driver = { diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c index 380215a..18428cf 100644 --- a/sys/dev/sfxge/sfxge.c +++ b/sys/dev/sfxge/sfxge.c @@ -757,11 +757,7 @@ static device_method_t sfxge_methods[] = { DEVMETHOD(device_attach, sfxge_attach), DEVMETHOD(device_detach, sfxge_detach), - /* Bus interface. */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - - { 0, 0 } + DEVMETHOD_END }; static devclass_t sfxge_devclass; diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c index c56760d..68679fe 100644 --- a/sys/dev/sge/if_sge.c +++ b/sys/dev/sge/if_sge.c @@ -158,16 +158,12 @@ static device_method_t sge_methods[] = { DEVMETHOD(device_resume, sge_resume), DEVMETHOD(device_shutdown, sge_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, sge_miibus_readreg), DEVMETHOD(miibus_writereg, sge_miibus_writereg), DEVMETHOD(miibus_statchg, sge_miibus_statchg), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t sge_driver = { diff --git a/sys/dev/siba/siba_pcib.c b/sys/dev/siba/siba_pcib.c index d6ddeb6..6236aed 100644 --- a/sys/dev/siba/siba_pcib.c +++ b/sys/dev/siba/siba_pcib.c @@ -403,7 +403,6 @@ static device_method_t siba_pcib_methods[] = { DEVMETHOD(device_probe, siba_pcib_probe), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, siba_pcib_read_ivar), DEVMETHOD(bus_write_ivar, siba_pcib_write_ivar), DEVMETHOD(bus_setup_intr, siba_pcib_setup_intr), @@ -419,7 +418,7 @@ static device_method_t siba_pcib_methods[] = { DEVMETHOD(pcib_write_config, siba_pcib_write_config), DEVMETHOD(pcib_route_interrupt, siba_pcib_route_interrupt), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t siba_pcib_driver = { diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c index 630281d..ba8106e 100644 --- a/sys/dev/sis/if_sis.c +++ b/sys/dev/sis/if_sis.c @@ -2393,16 +2393,12 @@ static device_method_t sis_methods[] = { DEVMETHOD(device_suspend, sis_suspend), DEVMETHOD(device_resume, sis_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, sis_miibus_readreg), DEVMETHOD(miibus_writereg, sis_miibus_writereg), DEVMETHOD(miibus_statchg, sis_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t sis_driver = { diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 4d2abb8..b217784 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -296,11 +296,7 @@ static device_method_t skc_methods[] = { DEVMETHOD(device_resume, skc_resume), DEVMETHOD(device_shutdown, skc_shutdown), - /* 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 skc_driver = { @@ -318,16 +314,12 @@ static device_method_t sk_methods[] = { DEVMETHOD(device_detach, sk_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, sk_miibus_readreg), DEVMETHOD(miibus_writereg, sk_miibus_writereg), DEVMETHOD(miibus_statchg, sk_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t sk_driver = { diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c index 1c17f6d..a111332 100644 --- a/sys/dev/smbus/smbus.c +++ b/sys/dev/smbus/smbus.c @@ -55,11 +55,10 @@ static device_method_t smbus_methods[] = { DEVMETHOD(device_attach, smbus_attach), DEVMETHOD(device_detach, smbus_detach), - /* bus interface */ + /* bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), - DEVMETHOD(bus_print_child, bus_generic_print_child), - { 0, 0 } + DEVMETHOD_END }; driver_t smbus_driver = { diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index ef211c6..58ac346 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -644,7 +644,6 @@ static device_method_t gusc_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, gusc_alloc_resource), DEVMETHOD(bus_release_resource, gusc_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -652,7 +651,7 @@ static device_method_t gusc_methods[] = { DEVMETHOD(bus_setup_intr, gusc_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t gusc_driver = { diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c index 3df2738..aa6003b 100644 --- a/sys/dev/sound/isa/sbc.c +++ b/sys/dev/sound/isa/sbc.c @@ -790,7 +790,6 @@ static device_method_t sbc_methods[] = { /* Bus interface */ DEVMETHOD(bus_read_ivar, sbc_read_ivar), DEVMETHOD(bus_write_ivar, sbc_write_ivar), - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, sbc_alloc_resource), DEVMETHOD(bus_release_resource, sbc_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -798,7 +797,7 @@ static device_method_t sbc_methods[] = { DEVMETHOD(bus_setup_intr, sbc_setup_intr), DEVMETHOD(bus_teardown_intr, sbc_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t sbc_driver = { diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 28eae75..04ea4ec 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -1076,7 +1076,6 @@ static device_method_t csa_methods[] = { DEVMETHOD(device_resume, csa_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, csa_alloc_resource), DEVMETHOD(bus_release_resource, csa_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -1084,7 +1083,7 @@ static device_method_t csa_methods[] = { DEVMETHOD(bus_setup_intr, csa_setup_intr), DEVMETHOD(bus_teardown_intr, csa_teardown_intr), - { 0, 0 } + DEVMETHOD_END }; static driver_t csa_driver = { diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 9f00652..ccfef36 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -276,7 +276,7 @@ fm801_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data) static kobj_method_t fm801_ac97_methods[] = { KOBJMETHOD(ac97_read, fm801_rdcd), KOBJMETHOD(ac97_write, fm801_wrcd), - KOBJMETHOD_END + DEVMETHOD_END }; AC97_DECLARE(fm801_ac97); @@ -530,7 +530,7 @@ static kobj_method_t fm801ch_methods[] = { KOBJMETHOD(channel_trigger, fm801ch_trigger), KOBJMETHOD(channel_getptr, fm801ch_getptr), KOBJMETHOD(channel_getcaps, fm801ch_getcaps), - KOBJMETHOD_END + DEVMETHOD_END }; CHANNEL_DECLARE(fm801ch); @@ -749,12 +749,12 @@ static device_method_t fm801_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, fm801_alloc_resource), DEVMETHOD(bus_release_resource, fm801_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - { 0, 0} + + DEVMETHOD_END }; static driver_t fm801_driver = { diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 0445572..de76f28 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -31,6 +31,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /* * USB audio specs: http://www.usb.org/developers/devclass_docs/audio10.pdf * http://www.usb.org/developers/devclass_docs/frmts10.pdf @@ -522,8 +525,8 @@ static device_method_t uaudio_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + + DEVMETHOD_END }; static driver_t uaudio_driver = { diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 9491734..43b4e7e 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -173,7 +173,6 @@ static device_method_t spibus_methods[] = { /* Bus interface */ DEVMETHOD(bus_add_child, spibus_add_child), DEVMETHOD(bus_print_child, spibus_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), DEVMETHOD(bus_probe_nomatch, spibus_probe_nomatch), DEVMETHOD(bus_read_ivar, spibus_read_ivar), DEVMETHOD(bus_child_pnpinfo_str, spibus_child_pnpinfo_str), @@ -183,7 +182,7 @@ static device_method_t spibus_methods[] = { /* spibus interface */ DEVMETHOD(spibus_transfer, spibus_transfer_impl), - { 0, 0 } + DEVMETHOD_END }; static driver_t spibus_driver = { diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c index a6fc00b..03e4eaa 100644 --- a/sys/dev/ste/if_ste.c +++ b/sys/dev/ste/if_ste.c @@ -161,16 +161,12 @@ static device_method_t ste_methods[] = { DEVMETHOD(device_suspend, ste_suspend), DEVMETHOD(device_resume, ste_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, ste_miibus_readreg), DEVMETHOD(miibus_writereg, ste_miibus_writereg), DEVMETHOD(miibus_statchg, ste_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t ste_driver = { diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c index b5ffc2c..4ab97e4 100644 --- a/sys/dev/tl/if_tl.c +++ b/sys/dev/tl/if_tl.c @@ -348,16 +348,12 @@ static device_method_t tl_methods[] = { DEVMETHOD(device_detach, tl_detach), DEVMETHOD(device_shutdown, tl_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, tl_miibus_readreg), DEVMETHOD(miibus_writereg, tl_miibus_writereg), DEVMETHOD(miibus_statchg, tl_miibus_statchg), - { 0, 0 } + DEVMETHOD_END }; static driver_t tl_driver = { diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c index b320a25..55132eb 100644 --- a/sys/dev/tsec/if_tsec_fdt.c +++ b/sys/dev/tsec/if_tsec_fdt.c @@ -88,15 +88,12 @@ static device_method_t tsec_methods[] = { DEVMETHOD(device_suspend, tsec_suspend), DEVMETHOD(device_resume, tsec_resume), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, tsec_miibus_readreg), DEVMETHOD(miibus_writereg, tsec_miibus_writereg), DEVMETHOD(miibus_statchg, tsec_miibus_statchg), - { 0, 0 } + + DEVMETHOD_END }; static driver_t tsec_fdt_driver = { diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c index 5651b7f..0d018b6 100644 --- a/sys/dev/twa/tw_osl_freebsd.c +++ b/sys/dev/twa/tw_osl_freebsd.c @@ -25,10 +25,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$"); + /* * AMCC'S 3ware driver for 9000 series storage controllers. * @@ -195,9 +196,7 @@ static device_method_t twa_methods[] = { DEVMETHOD(device_detach, twa_detach), DEVMETHOD(device_shutdown, twa_shutdown), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - {0, 0} + DEVMETHOD_END }; static driver_t twa_pci_driver = { diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index a7b9c91..29dab58 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -25,10 +25,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$"); + /* * FreeBSD-specific code. */ @@ -135,9 +136,7 @@ static device_method_t twe_methods[] = { DEVMETHOD(device_suspend, twe_suspend), DEVMETHOD(device_resume, twe_resume), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t twe_pci_driver = { diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c index 750f878..02f78a5 100644 --- a/sys/dev/tws/tws.c +++ b/sys/dev/tws/tws.c @@ -30,10 +30,10 @@ * 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 <dev/tws/tws.h> #include <dev/tws/tws_services.h> @@ -882,9 +882,7 @@ static device_method_t tws_methods[] = { DEVMETHOD(device_suspend, tws_suspend), DEVMETHOD(device_resume, tws_resume), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - { 0, 0 } + DEVMETHOD_END }; static driver_t tws_driver = { diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c index 49e9dad..eda14c0 100644 --- a/sys/dev/ubsec/ubsec.c +++ b/sys/dev/ubsec/ubsec.c @@ -123,17 +123,13 @@ static device_method_t ubsec_methods[] = { DEVMETHOD(device_resume, ubsec_resume), DEVMETHOD(device_shutdown, ubsec_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, ubsec_newsession), DEVMETHOD(cryptodev_freesession,ubsec_freesession), DEVMETHOD(cryptodev_process, ubsec_process), DEVMETHOD(cryptodev_kprocess, ubsec_kprocess), - { 0, 0 } + DEVMETHOD_END }; static driver_t ubsec_driver = { "ubsec", diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c index ee3feb8..822b5ce 100644 --- a/sys/dev/usb/controller/at91dci_atmelarm.c +++ b/sys/dev/usb/controller/at91dci_atmelarm.c @@ -346,10 +346,7 @@ static device_method_t at91_udp_methods[] = { DEVMETHOD(device_detach, at91_udp_detach), DEVMETHOD(device_shutdown, at91_udp_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t at91_udp_driver = { diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c index 8d033909..ed766d0 100644 --- a/sys/dev/usb/controller/atmegadci_atmelarm.c +++ b/sys/dev/usb/controller/atmegadci_atmelarm.c @@ -215,10 +215,7 @@ static device_method_t atmegadci_methods[] = { DEVMETHOD(device_detach, atmegadci_detach), DEVMETHOD(device_shutdown, atmegadci_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t atmegadci_driver = { diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 8ea133f..7f7cde8 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -339,10 +339,7 @@ static device_method_t ehci_methods[] = { DEVMETHOD(device_resume, ehci_ixp_resume), DEVMETHOD(device_shutdown, ehci_ixp_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t ehci_driver = { diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index bbfb6a7..90dc2b0 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -376,10 +376,7 @@ static device_method_t ehci_methods[] = { DEVMETHOD(device_resume, mv_ehci_resume), DEVMETHOD(device_shutdown, mv_ehci_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t ehci_driver = { diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 6abb193..25ccc6f 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -586,10 +586,8 @@ static driver_t ehci_driver = DEVMETHOD(device_suspend, ehci_pci_suspend), DEVMETHOD(device_resume, ehci_pci_resume), DEVMETHOD(device_shutdown, ehci_pci_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }, .size = sizeof(struct ehci_softc), }; diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c index 8a48264..37522f8 100644 --- a/sys/dev/usb/controller/musb_otg_atmelarm.c +++ b/sys/dev/usb/controller/musb_otg_atmelarm.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -24,6 +23,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/stdint.h> #include <sys/stddef.h> #include <sys/param.h> @@ -238,10 +240,7 @@ static device_method_t musbotg_methods[] = { DEVMETHOD(device_detach, musbotg_detach), DEVMETHOD(device_shutdown, musbotg_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t musbotg_driver = { diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c index 9a39740..122f705 100644 --- a/sys/dev/usb/controller/ohci_atmelarm.c +++ b/sys/dev/usb/controller/ohci_atmelarm.c @@ -223,10 +223,7 @@ static device_method_t ohci_methods[] = { DEVMETHOD(device_detach, ohci_atmelarm_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 = { diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index 9ff6e31..f7fa273 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -393,10 +393,7 @@ static driver_t ohci_driver = DEVMETHOD(device_resume, ohci_pci_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }, .size = sizeof(struct ohci_softc), }; diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c index 11b2579..480d040 100644 --- a/sys/dev/usb/controller/ohci_s3c24x0.c +++ b/sys/dev/usb/controller/ohci_s3c24x0.c @@ -200,10 +200,7 @@ static device_method_t ohci_methods[] = { DEVMETHOD(device_detach, ohci_s3c24x0_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 = { diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index 3192aac..b3fa7a1 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -459,9 +459,7 @@ static driver_t uhci_driver = DEVMETHOD(device_resume, uhci_pci_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }, .size = sizeof(struct uhci_softc), }; diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c index a8bd197..f40f0f5 100644 --- a/sys/dev/usb/controller/uss820dci_atmelarm.c +++ b/sys/dev/usb/controller/uss820dci_atmelarm.c @@ -76,10 +76,7 @@ static device_method_t uss820dci_methods[] = { DEVMETHOD(device_resume, uss820_atmelarm_resume), DEVMETHOD(device_shutdown, uss820_atmelarm_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} + DEVMETHOD_END }; static driver_t uss820dci_driver = { diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 40358bf..f25c88e 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -75,10 +75,8 @@ static device_method_t xhci_device_methods[] = { DEVMETHOD(device_suspend, xhci_pci_suspend), DEVMETHOD(device_resume, xhci_pci_resume), DEVMETHOD(device_shutdown, xhci_pci_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - {0, 0} + DEVMETHOD_END }; static driver_t xhci_driver = { diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c index a14f233..fdee6b7 100644 --- a/sys/dev/usb/net/if_aue.c +++ b/sys/dev/usb/net/if_aue.c @@ -254,15 +254,12 @@ static device_method_t aue_methods[] = { DEVMETHOD(device_attach, aue_attach), DEVMETHOD(device_detach, aue_detach), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* MII interface */ DEVMETHOD(miibus_readreg, aue_miibus_readreg), DEVMETHOD(miibus_writereg, aue_miibus_writereg), DEVMETHOD(miibus_statchg, aue_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t aue_driver = { diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index 0d18f2b..576639b 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -251,15 +251,12 @@ static device_method_t axe_methods[] = { DEVMETHOD(device_attach, axe_attach), DEVMETHOD(device_detach, axe_detach), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* MII interface */ DEVMETHOD(miibus_readreg, axe_miibus_readreg), DEVMETHOD(miibus_writereg, axe_miibus_writereg), DEVMETHOD(miibus_statchg, axe_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t axe_driver = { diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c index 11cb962..7dd889e 100644 --- a/sys/dev/usb/net/if_mos.c +++ b/sys/dev/usb/net/if_mos.c @@ -220,15 +220,12 @@ static device_method_t mos_methods[] = { DEVMETHOD(device_attach, mos_attach), DEVMETHOD(device_detach, mos_detach), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* MII interface */ DEVMETHOD(miibus_readreg, mos_miibus_readreg), DEVMETHOD(miibus_writereg, mos_miibus_writereg), DEVMETHOD(miibus_statchg, mos_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t mos_driver = { diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c index e4fd035..a870676 100644 --- a/sys/dev/usb/net/if_rue.c +++ b/sys/dev/usb/net/if_rue.c @@ -186,15 +186,12 @@ static device_method_t rue_methods[] = { DEVMETHOD(device_attach, rue_attach), DEVMETHOD(device_detach, rue_detach), - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* MII interface */ DEVMETHOD(miibus_readreg, rue_miibus_readreg), DEVMETHOD(miibus_writereg, rue_miibus_writereg), DEVMETHOD(miibus_statchg, rue_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t rue_driver = { diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c index 3fa3d15..8160a3b 100644 --- a/sys/dev/usb/net/if_udav.c +++ b/sys/dev/usb/net/if_udav.c @@ -145,15 +145,12 @@ static device_method_t udav_methods[] = { DEVMETHOD(device_attach, udav_attach), DEVMETHOD(device_detach, udav_detach), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - /* MII interface */ DEVMETHOD(miibus_readreg, udav_miibus_readreg), DEVMETHOD(miibus_writereg, udav_miibus_writereg), DEVMETHOD(miibus_statchg, udav_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t udav_driver = { diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c index 1c1a99b..a49af27 100644 --- a/sys/dev/vge/if_vge.c +++ b/sys/dev/vge/if_vge.c @@ -212,15 +212,11 @@ static device_method_t vge_methods[] = { DEVMETHOD(device_resume, vge_resume), DEVMETHOD(device_shutdown, vge_shutdown), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, vge_miibus_readreg), DEVMETHOD(miibus_writereg, vge_miibus_writereg), - { 0, 0 } + DEVMETHOD_END }; static driver_t vge_driver = { diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 0bcef0e..300296f 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -217,16 +217,12 @@ static device_method_t vr_methods[] = { DEVMETHOD(device_suspend, vr_suspend), DEVMETHOD(device_resume, vr_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, vr_miibus_readreg), DEVMETHOD(miibus_writereg, vr_miibus_writereg), DEVMETHOD(miibus_statchg, vr_miibus_statchg), - { NULL, NULL } + DEVMETHOD_END }; static driver_t vr_driver = { diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c index daac022..9c5cd95 100644 --- a/sys/dev/wb/if_wb.c +++ b/sys/dev/wb/if_wb.c @@ -212,15 +212,12 @@ static device_method_t wb_methods[] = { DEVMETHOD(device_detach, wb_detach), DEVMETHOD(device_shutdown, wb_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, wb_miibus_readreg), DEVMETHOD(miibus_writereg, wb_miibus_writereg), DEVMETHOD(miibus_statchg, wb_miibus_statchg), - { 0, 0 } + + DEVMETHOD_END }; static driver_t wb_driver = { diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c index e6c498b..cdc8f9c 100644 --- a/sys/dev/xen/pcifront/pcifront.c +++ b/sys/dev/xen/pcifront/pcifront.c @@ -516,14 +516,14 @@ static device_method_t xpcife_methods[] = { DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), 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 xpcife_driver = { @@ -647,7 +647,7 @@ xpcib_route_interrupt(device_t pcib, device_t dev, int pin) static device_method_t xpcib_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, xpcib_probe), + DEVMETHOD(device_probe, xpcib_probe), DEVMETHOD(device_attach, xpcib_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), @@ -655,7 +655,6 @@ static device_method_t xpcib_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, xpcib_read_ivar), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), @@ -669,7 +668,8 @@ static device_method_t xpcib_methods[] = { DEVMETHOD(pcib_read_config, xpcib_read_config), DEVMETHOD(pcib_write_config, xpcib_write_config), DEVMETHOD(pcib_route_interrupt, xpcib_route_interrupt), - { 0, 0 } + + DEVMETHOD_END }; static devclass_t xpcib_devclass; diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c index b774e7f..7a913f4 100644 --- a/sys/dev/xl/if_xl.c +++ b/sys/dev/xl/if_xl.c @@ -310,17 +310,13 @@ static device_method_t xl_methods[] = { DEVMETHOD(device_suspend, xl_suspend), DEVMETHOD(device_resume, xl_resume), - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - /* MII interface */ DEVMETHOD(miibus_readreg, xl_miibus_readreg), DEVMETHOD(miibus_writereg, xl_miibus_writereg), DEVMETHOD(miibus_statchg, xl_miibus_statchg), DEVMETHOD(miibus_mediainit, xl_miibus_mediainit), - { 0, 0 } + DEVMETHOD_END }; static driver_t xl_driver = { |
