svn commit: r190286 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
dev/cxgb sparc64/central sparc64/ebus sparc64/pci
sparc64/sbus sparc64/sparc64
Marius Strobl
marius at FreeBSD.org
Sun Mar 22 14:14:34 PDT 2009
Author: marius
Date: Sun Mar 22 21:14:33 2009
New Revision: 190286
URL: http://svn.freebsd.org/changeset/base/190286
Log:
MFC: r190099
- Sort device methods.
- Take advantage of KOBJMETHOD_END.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/sparc64/central/central.c
stable/7/sys/sparc64/ebus/ebus.c
stable/7/sys/sparc64/pci/apb.c
stable/7/sys/sparc64/pci/ofw_pcib.c
stable/7/sys/sparc64/sbus/dma_sbus.c
stable/7/sys/sparc64/sparc64/nexus.c
Modified: stable/7/sys/sparc64/central/central.c
==============================================================================
--- stable/7/sys/sparc64/central/central.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/central/central.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -76,14 +76,14 @@ static device_method_t central_methods[]
/* Bus interface */
DEVMETHOD(bus_print_child, central_print_child),
DEVMETHOD(bus_probe_nomatch, central_probe_nomatch),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_alloc_resource, central_alloc_resource),
- DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- DEVMETHOD(bus_get_resource_list, central_get_resource_list),
+ DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
+ DEVMETHOD(bus_get_resource_list, central_get_resource_list),
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_devinfo, central_get_devinfo),
@@ -93,7 +93,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),
- { NULL, NULL }
+ KOBJMETHOD_END
};
static driver_t central_driver = {
Modified: stable/7/sys/sparc64/ebus/ebus.c
==============================================================================
--- stable/7/sys/sparc64/ebus/ebus.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/ebus/ebus.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -110,14 +110,14 @@ static device_method_t ebus_methods[] =
/* Bus interface */
DEVMETHOD(bus_print_child, ebus_print_child),
DEVMETHOD(bus_probe_nomatch, ebus_probe_nomatch),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_alloc_resource, ebus_alloc_resource),
- DEVMETHOD(bus_get_resource_list, ebus_get_resource_list),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_release_resource, ebus_release_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
+ DEVMETHOD(bus_get_resource_list, ebus_get_resource_list),
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_devinfo, ebus_get_devinfo),
@@ -127,7 +127,7 @@ static device_method_t ebus_methods[] =
DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
- { 0, 0 }
+ KOBJMETHOD_END
};
static driver_t ebus_driver = {
Modified: stable/7/sys/sparc64/pci/apb.c
==============================================================================
--- stable/7/sys/sparc64/pci/apb.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/pci/apb.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -91,9 +91,9 @@ static device_method_t apb_methods[] = {
DEVMETHOD(bus_read_ivar, pcib_read_ivar),
DEVMETHOD(bus_write_ivar, pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, apb_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_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
@@ -106,7 +106,7 @@ static device_method_t apb_methods[] = {
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_node, ofw_pcib_gen_get_node),
- { 0, 0 }
+ KOBJMETHOD_END
};
static devclass_t pcib_devclass;
Modified: stable/7/sys/sparc64/pci/ofw_pcib.c
==============================================================================
--- stable/7/sys/sparc64/pci/ofw_pcib.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/pci/ofw_pcib.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -72,9 +72,9 @@ static device_method_t ofw_pcib_methods[
DEVMETHOD(bus_read_ivar, pcib_read_ivar),
DEVMETHOD(bus_write_ivar, pcib_write_ivar),
DEVMETHOD(bus_alloc_resource, pcib_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_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
@@ -87,7 +87,7 @@ static device_method_t ofw_pcib_methods[
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_node, ofw_pcib_gen_get_node),
- { 0, 0 }
+ KOBJMETHOD_END
};
static devclass_t pcib_devclass;
Modified: stable/7/sys/sparc64/sbus/dma_sbus.c
==============================================================================
--- stable/7/sys/sparc64/sbus/dma_sbus.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/sbus/dma_sbus.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -122,14 +122,14 @@ static device_method_t dma_methods[] = {
/* Bus interface */
DEVMETHOD(bus_print_child, dma_print_child),
DEVMETHOD(bus_probe_nomatch, dma_probe_nomatch),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource),
- DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- DEVMETHOD(bus_get_resource_list, dma_get_resource_list),
+ DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
+ DEVMETHOD(bus_get_resource_list, dma_get_resource_list),
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_devinfo, dma_get_devinfo),
@@ -139,7 +139,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),
- { 0, 0 }
+ KOBJMETHOD_END
};
static driver_t dma_driver = {
Modified: stable/7/sys/sparc64/sparc64/nexus.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/nexus.c Sun Mar 22 21:12:00 2009 (r190285)
+++ stable/7/sys/sparc64/sparc64/nexus.c Sun Mar 22 21:14:33 2009 (r190286)
@@ -122,11 +122,11 @@ static device_method_t nexus_methods[] =
DEVMETHOD(bus_release_resource, nexus_release_resource),
DEVMETHOD(bus_setup_intr, nexus_setup_intr),
DEVMETHOD(bus_teardown_intr, nexus_teardown_intr),
+ DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
+ DEVMETHOD(bus_get_resource_list, nexus_get_resource_list),
#ifdef SMP
DEVMETHOD(bus_bind_intr, nexus_bind_intr),
#endif
- DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
- DEVMETHOD(bus_get_resource_list, nexus_get_resource_list),
DEVMETHOD(bus_get_dma_tag, nexus_get_dma_tag),
/* ofw_bus interface */
@@ -137,7 +137,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),
- { 0, 0 }
+ KOBJMETHOD_END
};
static devclass_t nexus_devclass;
More information about the svn-src-all
mailing list