Date: Sun, 29 Jan 2012 01:27:39 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r230715 - in stable/8/sys: dev/bwn dev/esp dev/mii dev/ofw dev/siba dev/stge dev/vte sparc64/central sparc64/ebus sparc64/fhc sparc64/pci sparc64/sbus sparc64/sparc64 Message-ID: <201201290127.q0T1Rd5p009952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sun Jan 29 01:27:39 2012 New Revision: 230715 URL: http://svn.freebsd.org/changeset/base/230715 Log: MFC: r226173, r227848 s,KOBJMETHOD_END,DEVMETHOD_END,g in order to fully hide the explicit mention of kobj(9) from device drivers. Modified: stable/8/sys/dev/bwn/if_bwn.c stable/8/sys/dev/esp/esp_pci.c stable/8/sys/dev/esp/esp_sbus.c stable/8/sys/dev/mii/rdcphy.c stable/8/sys/dev/ofw/ofw_iicbus.c stable/8/sys/dev/siba/siba.c stable/8/sys/dev/siba/siba_bwn.c stable/8/sys/dev/siba/siba_cc.c stable/8/sys/dev/stge/if_stge.c stable/8/sys/dev/vte/if_vte.c stable/8/sys/sparc64/central/central.c stable/8/sys/sparc64/ebus/ebus.c stable/8/sys/sparc64/ebus/epic.c stable/8/sys/sparc64/fhc/fhc.c stable/8/sys/sparc64/pci/apb.c stable/8/sys/sparc64/pci/ofw_pcib.c stable/8/sys/sparc64/pci/ofw_pcibus.c stable/8/sys/sparc64/sbus/dma_sbus.c stable/8/sys/sparc64/sbus/sbus.c stable/8/sys/sparc64/sparc64/eeprom.c stable/8/sys/sparc64/sparc64/jbusppm.c stable/8/sys/sparc64/sparc64/nexus.c stable/8/sys/sparc64/sparc64/rtc.c stable/8/sys/sparc64/sparc64/sc_machdep.c stable/8/sys/sparc64/sparc64/schppm.c stable/8/sys/sparc64/sparc64/ssm.c stable/8/sys/sparc64/sparc64/upa.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/bwn/if_bwn.c ============================================================================== --- stable/8/sys/dev/bwn/if_bwn.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/bwn/if_bwn.c Sun Jan 29 01:27:39 2012 (r230715) @@ -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/8/sys/dev/esp/esp_pci.c ============================================================================== --- stable/8/sys/dev/esp/esp_pci.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/esp/esp_pci.c Sun Jan 29 01:27:39 2012 (r230715) @@ -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/8/sys/dev/esp/esp_sbus.c ============================================================================== --- stable/8/sys/dev/esp/esp_sbus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/esp/esp_sbus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -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/8/sys/dev/mii/rdcphy.c ============================================================================== --- stable/8/sys/dev/mii/rdcphy.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/mii/rdcphy.c Sun Jan 29 01:27:39 2012 (r230715) @@ -66,7 +66,7 @@ static device_method_t rdcphy_methods[] DEVMETHOD(device_attach, rdcphy_attach), DEVMETHOD(device_detach, mii_phy_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t rdcphy_devclass; Modified: stable/8/sys/dev/ofw/ofw_iicbus.c ============================================================================== --- stable/8/sys/dev/ofw/ofw_iicbus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/ofw/ofw_iicbus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -68,7 +68,7 @@ static device_method_t ofw_iicbus_method DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; struct ofw_iicbus_devinfo { Modified: stable/8/sys/dev/siba/siba.c ============================================================================== --- stable/8/sys/dev/siba/siba.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/siba/siba.c Sun Jan 29 01:27:39 2012 (r230715) @@ -632,7 +632,7 @@ static device_method_t siba_methods[] = DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_write_ivar, siba_write_ivar), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t siba_driver = { Modified: stable/8/sys/dev/siba/siba_bwn.c ============================================================================== --- stable/8/sys/dev/siba/siba_bwn.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/siba/siba_bwn.c Sun Jan 29 01:27:39 2012 (r230715) @@ -410,7 +410,7 @@ static device_method_t siba_bwn_methods[ DEVMETHOD(pci_release_msi, siba_bwn_release_msi), DEVMETHOD(pci_msi_count, siba_bwn_msi_count), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t siba_bwn_driver = { "siba_bwn", Modified: stable/8/sys/dev/siba/siba_cc.c ============================================================================== --- stable/8/sys/dev/siba/siba_cc.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/siba/siba_cc.c Sun Jan 29 01:27:39 2012 (r230715) @@ -141,7 +141,7 @@ static device_method_t siba_cc_methods[] DEVMETHOD(device_attach, siba_cc_attach), DEVMETHOD(device_probe, siba_cc_probe), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t siba_cc_driver = { Modified: stable/8/sys/dev/stge/if_stge.c ============================================================================== --- stable/8/sys/dev/stge/if_stge.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/stge/if_stge.c Sun Jan 29 01:27:39 2012 (r230715) @@ -221,8 +221,7 @@ static device_method_t stge_methods[] = DEVMETHOD(miibus_writereg, stge_miibus_writereg), DEVMETHOD(miibus_statchg, stge_miibus_statchg), - { 0, 0 } - + DEVMETHOD_END }; static driver_t stge_driver = { Modified: stable/8/sys/dev/vte/if_vte.c ============================================================================== --- stable/8/sys/dev/vte/if_vte.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/dev/vte/if_vte.c Sun Jan 29 01:27:39 2012 (r230715) @@ -151,7 +151,7 @@ static device_method_t vte_methods[] = { DEVMETHOD(miibus_writereg, vte_miibus_writereg), DEVMETHOD(miibus_statchg, vte_miibus_statchg), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t vte_driver = { Modified: stable/8/sys/sparc64/central/central.c ============================================================================== --- stable/8/sys/sparc64/central/central.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/central/central.c Sun Jan 29 01:27:39 2012 (r230715) @@ -96,7 +96,7 @@ static device_method_t central_methods[] DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t central_driver = { Modified: stable/8/sys/sparc64/ebus/ebus.c ============================================================================== --- stable/8/sys/sparc64/ebus/ebus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/ebus/ebus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -181,7 +181,7 @@ static device_method_t ebus_nexus_method DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t ebus_nexus_driver = { @@ -228,7 +228,7 @@ static device_method_t ebus_pci_methods[ DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t ebus_pci_driver = { Modified: stable/8/sys/sparc64/ebus/epic.c ============================================================================== --- stable/8/sys/sparc64/ebus/epic.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/ebus/epic.c Sun Jan 29 01:27:39 2012 (r230715) @@ -125,7 +125,7 @@ static device_method_t epic_methods[] = DEVMETHOD(device_attach, epic_attach), DEVMETHOD(device_detach, epic_detach), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t epic_devclass; Modified: stable/8/sys/sparc64/fhc/fhc.c ============================================================================== --- stable/8/sys/sparc64/fhc/fhc.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/fhc/fhc.c Sun Jan 29 01:27:39 2012 (r230715) @@ -110,7 +110,7 @@ static device_method_t fhc_methods[] = { DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t fhc_driver = { Modified: stable/8/sys/sparc64/pci/apb.c ============================================================================== --- stable/8/sys/sparc64/pci/apb.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/pci/apb.c Sun Jan 29 01:27:39 2012 (r230715) @@ -96,7 +96,7 @@ static device_method_t apb_methods[] = { /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, ofw_pcib_gen_get_node), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t pcib_devclass; Modified: stable/8/sys/sparc64/pci/ofw_pcib.c ============================================================================== --- stable/8/sys/sparc64/pci/ofw_pcib.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/pci/ofw_pcib.c Sun Jan 29 01:27:39 2012 (r230715) @@ -74,7 +74,7 @@ static device_method_t ofw_pcib_methods[ /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, ofw_pcib_gen_get_node), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t pcib_devclass; Modified: stable/8/sys/sparc64/pci/ofw_pcibus.c ============================================================================== --- stable/8/sys/sparc64/pci/ofw_pcibus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/pci/ofw_pcibus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -90,7 +90,7 @@ static device_method_t ofw_pcibus_method DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; struct ofw_pcibus_devinfo { Modified: stable/8/sys/sparc64/sbus/dma_sbus.c ============================================================================== --- stable/8/sys/sparc64/sbus/dma_sbus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sbus/dma_sbus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -134,7 +134,7 @@ static device_method_t dma_methods[] = { DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t dma_driver = { Modified: stable/8/sys/sparc64/sbus/sbus.c ============================================================================== --- stable/8/sys/sparc64/sbus/sbus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sbus/sbus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -188,7 +188,7 @@ static device_method_t sbus_methods[] = DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t sbus_driver = { Modified: stable/8/sys/sparc64/sparc64/eeprom.c ============================================================================== --- stable/8/sys/sparc64/sparc64/eeprom.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/eeprom.c Sun Jan 29 01:27:39 2012 (r230715) @@ -91,7 +91,7 @@ static device_method_t eeprom_methods[] DEVMETHOD(clock_gettime, mk48txx_gettime), DEVMETHOD(clock_settime, mk48txx_settime), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t eeprom_driver = { Modified: stable/8/sys/sparc64/sparc64/jbusppm.c ============================================================================== --- stable/8/sys/sparc64/sparc64/jbusppm.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/jbusppm.c Sun Jan 29 01:27:39 2012 (r230715) @@ -82,7 +82,7 @@ static device_method_t jbusppm_methods[] DEVMETHOD(device_probe, jbusppm_probe), DEVMETHOD(device_attach, jbusppm_attach), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t jbusppm_devclass; Modified: stable/8/sys/sparc64/sparc64/nexus.c ============================================================================== --- stable/8/sys/sparc64/sparc64/nexus.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/nexus.c Sun Jan 29 01:27:39 2012 (r230715) @@ -144,7 +144,7 @@ static device_method_t nexus_methods[] = DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t nexus_devclass; Modified: stable/8/sys/sparc64/sparc64/rtc.c ============================================================================== --- stable/8/sys/sparc64/sparc64/rtc.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/rtc.c Sun Jan 29 01:27:39 2012 (r230715) @@ -90,7 +90,7 @@ static device_method_t rtc_ebus_methods[ DEVMETHOD(clock_gettime, mc146818_gettime), DEVMETHOD(clock_settime, mc146818_settime), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t rtc_ebus_driver = { @@ -111,7 +111,7 @@ static device_method_t rtc_isa_methods[] DEVMETHOD(clock_gettime, mc146818_gettime), DEVMETHOD(clock_settime, mc146818_settime), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t rtc_isa_driver = { Modified: stable/8/sys/sparc64/sparc64/sc_machdep.c ============================================================================== --- stable/8/sys/sparc64/sparc64/sc_machdep.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/sc_machdep.c Sun Jan 29 01:27:39 2012 (r230715) @@ -57,7 +57,7 @@ static device_method_t sc_methods[] = { DEVMETHOD(device_probe, sc_probe), DEVMETHOD(device_attach, sc_attach), - KOBJMETHOD_END + DEVMETHOD_END }; static driver_t sc_driver = { Modified: stable/8/sys/sparc64/sparc64/schppm.c ============================================================================== --- stable/8/sys/sparc64/sparc64/schppm.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/schppm.c Sun Jan 29 01:27:39 2012 (r230715) @@ -73,7 +73,7 @@ static device_method_t schppm_methods[] DEVMETHOD(device_probe, schppm_probe), DEVMETHOD(device_attach, schppm_attach), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t schppm_devclass; Modified: stable/8/sys/sparc64/sparc64/ssm.c ============================================================================== --- stable/8/sys/sparc64/sparc64/ssm.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/ssm.c Sun Jan 29 01:27:39 2012 (r230715) @@ -52,7 +52,7 @@ static device_method_t ssm_methods[] = { /* ofw_bus interface */ - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t ssm_devclass; Modified: stable/8/sys/sparc64/sparc64/upa.c ============================================================================== --- stable/8/sys/sparc64/sparc64/upa.c Sun Jan 29 01:22:48 2012 (r230714) +++ stable/8/sys/sparc64/sparc64/upa.c Sun Jan 29 01:27:39 2012 (r230715) @@ -147,7 +147,7 @@ static device_method_t upa_methods[] = { DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t upa_devclass;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201290127.q0T1Rd5p009952>