summaryrefslogtreecommitdiffstats
path: root/sys/dev/firewire
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/firewire
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/firewire')
-rw-r--r--sys/dev/firewire/firewire.c9
-rw-r--r--sys/dev/firewire/fwohci_pci.c8
2 files changed, 8 insertions, 9 deletions
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 = {
OpenPOWER on IntegriCloud