summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/controller
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2011-11-22 21:28:20 +0000
committermarius <marius@FreeBSD.org>2011-11-22 21:28:20 +0000
commit17e14c6132be998c8e8d0c2fc89ff0b66d24999c (patch)
tree4941db3a873a5f9b2ccc4a64c23bf5cd65516206 /sys/dev/usb/controller
parent6479d45e1526c99672febf3a29a6a99305871131 (diff)
downloadFreeBSD-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/dev/usb/controller')
-rw-r--r--sys/dev/usb/controller/at91dci_atmelarm.c5
-rw-r--r--sys/dev/usb/controller/atmegadci_atmelarm.c5
-rw-r--r--sys/dev/usb/controller/ehci_ixp4xx.c5
-rw-r--r--sys/dev/usb/controller/ehci_mv.c5
-rw-r--r--sys/dev/usb/controller/ehci_pci.c4
-rw-r--r--sys/dev/usb/controller/musb_otg_atmelarm.c9
-rw-r--r--sys/dev/usb/controller/ohci_atmelarm.c5
-rw-r--r--sys/dev/usb/controller/ohci_pci.c5
-rw-r--r--sys/dev/usb/controller/ohci_s3c24x0.c5
-rw-r--r--sys/dev/usb/controller/uhci_pci.c4
-rw-r--r--sys/dev/usb/controller/uss820dci_atmelarm.c5
-rw-r--r--sys/dev/usb/controller/xhci_pci.c4
12 files changed, 15 insertions, 46 deletions
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 = {
OpenPOWER on IntegriCloud