Move the mstohz macro out of ubs_port.h and to the three places where it is

used.

ok jsg.

4 files changed, 10 insertions, 6 deletions

diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 1a989d0dfc1..19ed8f70ec8 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.75 2007/06/14 06:55:09 mbalmer Exp $ */
+/*	$OpenBSD: ehci.c,v 1.76 2007/06/14 12:58:09 mbalmer Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -102,6 +102,8 @@ int ehcidebug = 0;
 #define DPRINTFN(n,x)
 #endif
 
+#define mstohz(ms) ((ms) * hz / 1000)
+
 struct ehci_pipe {
 	struct usbd_pipe pipe;
 
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 64328cfd54f..1e30d54c019 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.82 2007/06/12 16:26:36 mbalmer Exp $ */
+/*	$OpenBSD: ohci.c,v 1.83 2007/06/14 12:58:09 mbalmer Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -81,6 +81,8 @@ int ohcidebug = 0;
 #define DPRINTFN(n,x)
 #endif
 
+#define mstohz(ms) ((ms) * hz / 1000)
+
 /*
  * The OHCI controller is little endian, so on big endian machines
  * the data stored in memory needs to be swapped.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 26ebe968c72..afb00e99c6e 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.58 2007/06/12 16:26:36 mbalmer Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.59 2007/06/14 12:58:09 mbalmer Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -89,6 +89,8 @@ int uhcinoloop = 0;
 #define DPRINTFN(n,x)
 #endif
 
+#define mstohz(ms) ((ms) * hz / 1000)
+
 /*
  * The UHCI controller is little endian, so on big endian machines
  * the data stored in memory needs to be swapped.
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index e803329e513..550e8007b05 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_port.h,v 1.93 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.94 2007/06/14 12:58:09 mbalmer Exp $ */
 /*	$NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -52,6 +52,4 @@
 #undef USB_USE_SOFTINTR
 #endif
 
-#define mstohz(ms) ((ms) * hz / 1000)
-
 #endif /* _USB_PORT_H */