diff options
author | marius <marius@FreeBSD.org> | 2011-11-22 21:28:20 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2011-11-22 21:28:20 +0000 |
commit | 17e14c6132be998c8e8d0c2fc89ff0b66d24999c (patch) | |
tree | 4941db3a873a5f9b2ccc4a64c23bf5cd65516206 /sys/sparc64/pci | |
parent | 6479d45e1526c99672febf3a29a6a99305871131 (diff) | |
download | FreeBSD-src-17e14c6132be998c8e8d0c2fc89ff0b66d24999c.zip FreeBSD-src-17e14c6132be998c8e8d0c2fc89ff0b66d24999c.tar.gz |
- There's no need to overwrite the default device method with the default
one. Interestingly, these are actually the default for quite some time
(bus_generic_driver_added(9) since r52045 and bus_generic_print_child(9)
since r52045) but even recently added device drivers do this unnecessarily.
Discussed with: jhb, marcel
- While at it, use DEVMETHOD_END.
Discussed with: jhb
- Also while at it, use __FBSDID.
Diffstat (limited to 'sys/sparc64/pci')
-rw-r--r-- | sys/sparc64/pci/fire.c | 3 | ||||
-rw-r--r-- | sys/sparc64/pci/psycho.c | 4 | ||||
-rw-r--r-- | sys/sparc64/pci/sbbc.c | 7 | ||||
-rw-r--r-- | sys/sparc64/pci/schizo.c | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c index 5a1e08a..0dbe536 100644 --- a/sys/sparc64/pci/fire.c +++ b/sys/sparc64/pci/fire.c @@ -140,7 +140,6 @@ static device_method_t fire_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, fire_read_ivar), DEVMETHOD(bus_setup_intr, fire_setup_intr), DEVMETHOD(bus_teardown_intr, fire_teardown_intr), @@ -165,7 +164,7 @@ static device_method_t fire_methods[] = { /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, fire_get_node), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t fire_devclass; diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index f7b5d4a..0ebbb40 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -130,7 +130,6 @@ static device_method_t psycho_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, psycho_read_ivar), DEVMETHOD(bus_setup_intr, psycho_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -139,7 +138,6 @@ static device_method_t psycho_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_adjust_resource, psycho_adjust_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_describe_intr, bus_generic_describe_intr), DEVMETHOD(bus_get_dma_tag, psycho_get_dma_tag), /* pcib interface */ @@ -154,7 +152,7 @@ static device_method_t psycho_methods[] = { /* ofw_pci interface */ DEVMETHOD(ofw_pci_setup_device, psycho_setup_device), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t psycho_devclass; diff --git a/sys/sparc64/pci/sbbc.c b/sys/sparc64/pci/sbbc.c index 812b350..491f653 100644 --- a/sys/sparc64/pci/sbbc.c +++ b/sys/sparc64/pci/sbbc.c @@ -279,7 +279,6 @@ static device_method_t sbbc_pci_methods[] = { DEVMETHOD(device_probe, sbbc_pci_probe), DEVMETHOD(device_attach, sbbc_pci_attach), - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_alloc_resource, sbbc_bus_alloc_resource), DEVMETHOD(bus_activate_resource,sbbc_bus_activate_resource), DEVMETHOD(bus_deactivate_resource,sbbc_bus_deactivate_resource), @@ -294,7 +293,7 @@ static device_method_t sbbc_pci_methods[] = { DEVMETHOD(clock_gettime, sbbc_tod_gettime), DEVMETHOD(clock_settime, sbbc_tod_settime), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t sbbc_devclass; @@ -605,7 +604,7 @@ static device_method_t sbbc_uart_sbbc_methods[] = { DEVMETHOD(device_attach, uart_bus_attach), DEVMETHOD(device_detach, uart_bus_detach), - KOBJMETHOD_END + DEVMETHOD_END }; DEFINE_CLASS_0(uart, sbbc_uart_driver, sbbc_uart_sbbc_methods, @@ -806,7 +805,7 @@ static kobj_method_t sbbc_uart_methods[] = { KOBJMETHOD(uart_setsig, sbbc_uart_bus_setsig), KOBJMETHOD(uart_transmit, sbbc_uart_bus_transmit), - KOBJMETHOD_END + DEVMETHOD_END }; struct uart_class uart_sbbc_class = { diff --git a/sys/sparc64/pci/schizo.c b/sys/sparc64/pci/schizo.c index b0e7545..9a27043 100644 --- a/sys/sparc64/pci/schizo.c +++ b/sys/sparc64/pci/schizo.c @@ -130,7 +130,6 @@ static device_method_t schizo_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, schizo_read_ivar), DEVMETHOD(bus_setup_intr, schizo_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -153,7 +152,7 @@ static device_method_t schizo_methods[] = { /* ofw_pci interface */ DEVMETHOD(ofw_pci_setup_device, schizo_setup_device), - KOBJMETHOD_END + DEVMETHOD_END }; static devclass_t schizo_devclass; |