aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hibma <n_hibma@FreeBSD.org>1999-01-14 01:35:12 +0000
committerNick Hibma <n_hibma@FreeBSD.org>1999-01-14 01:35:12 +0000
commit5f2848a953c6dbe81c232e4ebf213f829767a173 (patch)
tree9f31cd5f3a36819f72bfffe86bfa4effd56ad80b
parent1c8fa237245312193ea2381fdad3b98e5bbe6ed4 (diff)
downloadsrc-5f2848a953c6dbe81c232e4ebf213f829767a173.tar.gz
src-5f2848a953c6dbe81c232e4ebf213f829767a173.zip
Removal unneccessary definitions
Notes
Notes: svn path=/head/; revision=42641
-rw-r--r--sys/dev/usb/usb_port.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index fbecbf0f6b2c..d7bd4f0040dd 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
/* $NetBSD: usb_port.h,v 1.5 1999/01/08 11:58:25 augustss Exp $ */
-/* FreeBSD $Id: usb_port.h,v 1.8 1999/01/07 23:31:38 n_hibma Exp $ */
+/* $FreeBSD$ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ typedef struct device bdevice; /* base device */
#define usb_timeout(f, d, t, h) timeout((f), (d), (t))
#define usb_untimeout(f, d, h) untimeout((f), (d))
-#define USB_DECLARE_DRIVER_NAME_INIT(_1, dname, _2) \
+#define USB_DECLARE_DRIVER_INIT(dname, _2) \
int __CONCAT(dname,_match) __P((struct device *, struct cfdata *, void *)); \
void __CONCAT(dname,_attach) __P((struct device *, struct device *, void *)); \
\
@@ -141,7 +141,7 @@ __CONCAT(dname,_attach)(parent, self, aux) \
#define usb_timeout(f, d, t, h) ((h) = timeout((f), (d), (t)))
#define usb_untimeout(f, d, h) untimeout((f), (d), (h))
-#define USB_DECLARE_DRIVER_NAME_INIT(name, dname, init...) \
+#define USB_DECLARE_DRIVER_INIT(dname, init...) \
static device_probe_t __CONCAT(dname,_match); \
static device_attach_t __CONCAT(dname,_attach); \
static device_detach_t __CONCAT(dname,_detach); \
@@ -157,7 +157,7 @@ static device_method_t __CONCAT(dname,_methods)[] = { \
}; \
\
static driver_t __CONCAT(dname,_driver) = { \
- name, \
+ #dname, \
__CONCAT(dname,_methods), \
DRIVER_TYPE_MISC, \
sizeof(struct __CONCAT(dname,_softc)) \
@@ -213,9 +213,5 @@ __CONCAT(dname,_attach)(device_t self)
-#define USB_DECLARE_DRIVER_NAME(name, dname) \
- USB_DECLARE_DRIVER_NAME_INIT(#name, dname, {0,0} )
-#define USB_DECLARE_DRIVER_INIT(dname, init) \
- USB_DECLARE_DRIVER_NAME_INIT(#dname, dname, init )
#define USB_DECLARE_DRIVER(dname) \
- USB_DECLARE_DRIVER_NAME_INIT(#dname, dname, {0,0} )
+ USB_DECLARE_DRIVER_INIT(dname, {0,0} )