From 4f9929e80f673867f34257a2571612c55ed57dfe Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 12 Jun 2007 17:30:54 +0000
Subject: [PATCH] Eliminate usb_thread_t.

---
 sys/dev/usb/ucom.c                                 |  2 +-
 sys/dev/usb/ucomvar.h                              |  2 +-
 sys/dev/usb/ufm.c                                  |  6 +++---
 sys/dev/usb/uhid.c                                 | 12 ++++++------
 sys/dev/usb/ulpt.c                                 |  6 +++---
 sys/dev/usb/umodem.c                               |  4 ++--
 sys/dev/usb/ums.c                                  |  8 ++++----
 sys/dev/usb/uplcom.c                               |  2 +-
 sys/dev/usb/urio.c                                 |  6 +++---
 sys/dev/usb/usb.c                                  |  8 ++++----
 sys/dev/usb/usb_port.h                             |  2 --
 sys/dev/usb/uscanner.c                             |  6 +++---
 sys/dev/usb/uvscom.c                               |  2 +-
 sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c |  9 +++++----
 14 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 8c9dd6f4ceae..076e66147f06 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -321,7 +321,7 @@ ucomclose(struct tty *tp)
 }
 
 static int
-ucomioctl(struct tty *tp, u_long cmd, void *data, int flag, usb_proc_ptr p)
+ucomioctl(struct tty *tp, u_long cmd, void *data, int flag, struct thread *p)
 {
 	struct ucom_softc *sc;
 	int error;
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index fb8641252c65..25cbc53d70e4 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -97,7 +97,7 @@ struct ucom_callback {
 #define UCOM_SET_RTS 2
 #define UCOM_SET_BREAK 3
 	int (*ucom_param)(void *, int, struct termios *);
-	int (*ucom_ioctl)(void *, int, u_long, caddr_t, int, usb_proc_ptr);
+	int (*ucom_ioctl)(void *, int, u_long, caddr_t, int, struct thread *);
 	int (*ucom_open)(void *, int);
 	void (*ucom_close)(void *, int);
 	void (*ucom_read)(void *, int, u_char **, u_int32_t *);
diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c
index bdd57ee1463e..35bd81bed80a 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/dev/usb/ufm.c
@@ -169,7 +169,7 @@ USB_ATTACH(ufm)
 
 
 int
-ufmopen(struct cdev *dev, int flag, int mode, usb_proc_ptr td)
+ufmopen(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct ufm_softc *sc;
 
@@ -190,7 +190,7 @@ ufmopen(struct cdev *dev, int flag, int mode, usb_proc_ptr td)
 }
 
 int
-ufmclose(struct cdev *dev, int flag, int mode, usb_proc_ptr td)
+ufmclose(struct cdev *dev, int flag, int mode, struct thread *td)
 {
 	struct ufm_softc *sc;
 
@@ -311,7 +311,7 @@ ufm_get_stat(struct ufm_softc *sc, caddr_t addr)
 }
 
 int
-ufmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr td)
+ufmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
 	struct ufm_softc *sc;
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 0064c6791e2d..7dabdae93677 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -173,7 +173,7 @@ static void uhid_intr(usbd_xfer_handle, usbd_private_handle,
 static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
 static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
 static int uhid_do_ioctl(struct uhid_softc *, u_long, caddr_t, int,
-			      usb_proc_ptr);
+			      struct thread *);
 
 USB_DECLARE_DRIVER(uhid);
 
@@ -428,7 +428,7 @@ uhid_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
 }
 
 int
-uhidopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+uhidopen(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	struct uhid_softc *sc;
 	usbd_status err;
@@ -471,7 +471,7 @@ uhidopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-uhidclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+uhidclose(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	struct uhid_softc *sc;
 
@@ -623,7 +623,7 @@ uhidwrite(struct cdev *dev, struct uio *uio, int flag)
 
 int
 uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, int flag,
-	      usb_proc_ptr p)
+	      struct thread *p)
 {
 	struct usb_ctl_report_desc *rd;
 	struct usb_ctl_report *re;
@@ -737,7 +737,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, int flag,
 }
 
 int
-uhidioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uhidioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *p)
 {
 	struct uhid_softc *sc;
 	int error;
@@ -752,7 +752,7 @@ uhidioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
 }
 
 int
-uhidpoll(struct cdev *dev, int events, usb_proc_ptr p)
+uhidpoll(struct cdev *dev, int events, struct thread *p)
 {
 	struct uhid_softc *sc;
 	int revents = 0;
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 7a78d818dc62..65aaaccb23e4 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -434,7 +434,7 @@ int ulptusein = 1;
  * Reset the printer, then wait until it's selected and not busy.
  */
 int
-ulptopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+ulptopen(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	u_char flags = ULPTFLAGS(dev);
 	struct ulpt_softc *sc;
@@ -562,7 +562,7 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
 }
 
 int
-ulptclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+ulptclose(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	struct ulpt_softc *sc;
 
@@ -748,7 +748,7 @@ ulpt_tick(void *xsc)
 }
 
 int
-ulptioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ulptioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *p)
 {
 	int error = 0;
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 7eb50aa7c9ab..700df565fe80 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -187,7 +187,7 @@ static void	umodem_rts(struct umodem_softc *, int);
 static void	umodem_break(struct umodem_softc *, int);
 static void	umodem_set_line_state(struct umodem_softc *);
 static int	umodem_param(void *, int, struct termios *);
-static int	umodem_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr );
+static int	umodem_ioctl(void *, int, u_long, caddr_t, int, struct thread *);
 static int	umodem_open(void *, int portno);
 static void	umodem_close(void *, int portno);
 static void	umodem_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
@@ -614,7 +614,7 @@ umodem_param(void *addr, int portno, struct termios *t)
 
 int
 umodem_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
-	     usb_proc_ptr p)
+	     struct thread *p)
 {
 	struct umodem_softc *sc = addr;
 	int error = 0;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index fad6c54f16ae..b248eb9cc068 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -618,7 +618,7 @@ ums_disable(priv)
 }
 
 static int
-ums_open(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
+ums_open(struct cdev *dev, int flag, int fmt, struct thread *p)
 {
 	struct ums_softc *sc;
 
@@ -628,7 +628,7 @@ ums_open(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
 }
 
 static int
-ums_close(struct cdev *dev, int flag, int fmt, usb_proc_ptr p)
+ums_close(struct cdev *dev, int flag, int fmt, struct thread *p)
 {
 	struct ums_softc *sc;
 
@@ -714,7 +714,7 @@ ums_read(struct cdev *dev, struct uio *uio, int flag)
 }
 
 static int
-ums_poll(struct cdev *dev, int events, usb_proc_ptr p)
+ums_poll(struct cdev *dev, int events, struct thread *p)
 {
 	struct ums_softc *sc;
 	int revents = 0;
@@ -740,7 +740,7 @@ ums_poll(struct cdev *dev, int events, usb_proc_ptr p)
 }
 
 int
-ums_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+ums_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *p)
 {
 	struct ums_softc *sc;
 	int error = 0;
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 178af5ebd362..af0df4329169 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -986,7 +986,7 @@ uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
 #if 0 /* TODO */
 static int
 uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
-	     usb_proc_ptr p)
+	     struct thread *p)
 {
 	struct uplcom_softc *sc = addr;
 	int error = 0;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index d17f01794f47..3293dd4c3eac 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -270,7 +270,7 @@ USB_ATTACH(urio)
 
 
 int
-urioopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+urioopen(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 #if (USBDI >= 1)
 	struct urio_softc * sc;
@@ -310,7 +310,7 @@ urioopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-urioclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+urioclose(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 #if (USBDI >= 1)
 	struct urio_softc * sc;
@@ -474,7 +474,7 @@ uriowrite(struct cdev *dev, struct uio *uio, int flag)
 
 
 int
-urioioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+urioioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *p)
 {
 #if (USBDI >= 1)
 	struct urio_softc * sc;
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 63df3c770ef9..f49e4ff41add 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -519,7 +519,7 @@ usbctlprint(void *aux, const char *pnp)
 #endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
 
 int
-usbopen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+usbopen(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	int unit = USBUNIT(dev);
 	struct usb_softc *sc;
@@ -575,7 +575,7 @@ usbread(struct cdev *dev, struct uio *uio, int flag)
 }
 
 int
-usbclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+usbclose(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	int unit = USBUNIT(dev);
 
@@ -588,7 +588,7 @@ usbclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-usbioctl(struct cdev *devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+usbioctl(struct cdev *devt, u_long cmd, caddr_t data, int flag, struct thread *p)
 {
 	struct usb_softc *sc;
 	int unit = USBUNIT(devt);
@@ -704,7 +704,7 @@ usbioctl(struct cdev *devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 }
 
 int
-usbpoll(struct cdev *dev, int events, usb_proc_ptr p)
+usbpoll(struct cdev *dev, int events, struct thread *p)
 {
 	int revents, mask, s;
 	int unit = USBUNIT(dev);
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index faadeb13a825..9540a904b042 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -73,8 +73,6 @@ MALLOC_DECLARE(M_USBHC);
 
 #define USBGETSOFTC(bdev) (device_get_softc(bdev))
 
-typedef struct thread *usb_proc_ptr;
-
 #define usb_kthread_create1(f, s, p, a0, a1) \
 		kthread_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1))
 #define usb_kthread_create2(f, s, p, a0) \
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 2bfbd7d0db6a..5e7257804e72 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -383,7 +383,7 @@ USB_ATTACH(uscanner)
 }
 
 int
-uscanneropen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+uscanneropen(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	struct uscanner_softc *sc;
 	int unit = USCANNERUNIT(dev);
@@ -446,7 +446,7 @@ uscanneropen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-uscannerclose(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+uscannerclose(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	struct uscanner_softc *sc;
 
@@ -676,7 +676,7 @@ USB_DETACH(uscanner)
 }
 
 int
-uscannerpoll(struct cdev *dev, int events, usb_proc_ptr p)
+uscannerpoll(struct cdev *dev, int events, struct thread *p)
 {
 	struct uscanner_softc *sc;
 	int revents = 0;
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index a09c644e1990..ca98af451f52 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -920,7 +920,7 @@ uvscom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
 #if 0 /* TODO */
 static int
 uvscom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
-	     usb_proc_ptr p)
+	     struct thread *p)
 {
 	struct uvscom_softc *sc = addr;
 	int error = 0;
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 8a907e8d9f14..7877853eacd0 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -269,7 +269,7 @@ USB_DETACH(ubtbcmfw)
  */
 
 static int
-ubtbcmfw_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+ubtbcmfw_open(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			error = 0;
@@ -321,7 +321,7 @@ ubtbcmfw_open(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
  */
 
 static int
-ubtbcmfw_close(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
+ubtbcmfw_close(struct cdev *dev, int flag, int mode, struct thread *p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 
@@ -487,7 +487,8 @@ ubtbcmfw_write(struct cdev *dev, struct uio *uio, int flag)
  */
 
 static int
-ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag,
+  struct thread *p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			error = 0;
@@ -524,7 +525,7 @@ ubtbcmfw_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, usb_proc_pt
  */
 
 static int
-ubtbcmfw_poll(struct cdev *dev, int events, usb_proc_ptr p)
+ubtbcmfw_poll(struct cdev *dev, int events, struct thread *p)
 {
 	ubtbcmfw_softc_p	sc = NULL;
 	int			revents = 0;