Remove the usb_proc_ptr type definition, which was really a 'struct proc *'

only.

No binary change.

ok mk.

14 files changed, 60 insertions, 62 deletions

diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 9d26b07f768..931341e535f 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.38 2007/06/10 14:49:00 mbalmer Exp $ */
+/*	$OpenBSD: ucom.c,v 1.39 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -136,7 +136,7 @@ int	ucomparam(struct tty *, struct termios *);
 void	ucomstart(struct tty *);
 void	ucom_shutdown(struct ucom_softc *);
 int	ucom_do_ioctl(struct ucom_softc *, u_long, caddr_t,
-			      int, usb_proc_ptr);
+			      int, struct proc *);
 void	ucom_dtr(struct ucom_softc *, int);
 void	ucom_rts(struct ucom_softc *, int);
 void	ucom_break(struct ucom_softc *, int);
@@ -292,7 +292,7 @@ ucom_shutdown(struct ucom_softc *sc)
 }
 
 int
-ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	int unit = UCOMUNIT(dev);
 	usbd_status err;
@@ -534,7 +534,7 @@ bad:
 }
 
 int
-ucomclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
 	struct tty *tp = sc->sc_tty;
@@ -606,7 +606,7 @@ ucomtty(dev_t dev)
 }
 
 int
-ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
 	int error;
@@ -620,7 +620,7 @@ ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 
 int
 ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
-	      int flag, usb_proc_ptr p)
+	      int flag, struct proc *p)
 {
 	struct tty *tp = sc->sc_tty;
 	int error;
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index 8ec54457157..d58725c7723 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucomvar.h,v 1.14 2006/08/18 02:54:11 jason Exp $ */
+/*	$OpenBSD: ucomvar.h,v 1.15 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: ucomvar.h,v 1.10 2001/12/31 12:15:21 augustss Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ struct ucom_methods {
 #define UCOM_SET_BREAK 3
 	int (*ucom_param)(void *sc, int portno, struct termios *);
 	int (*ucom_ioctl)(void *sc, int portno, u_long cmd,
-			  caddr_t data, int flag, usb_proc_ptr p);
+			  caddr_t data, int flag, struct proc *p);
 	int (*ucom_open)(void *sc, int portno);
 	void (*ucom_close)(void *sc, int portno);
 	void (*ucom_read)(void *sc, int portno, u_char **ptr, u_int32_t *count);
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index b57bb9aaa7f..5143300072f 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.46 2007/06/11 12:36:52 mbalmer Exp $ */
+/*	$OpenBSD: ugen.c,v 1.47 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -119,7 +119,7 @@ void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr,
 int ugen_do_read(struct ugen_softc *, int, struct uio *, int);
 int ugen_do_write(struct ugen_softc *, int, struct uio *, int);
 int ugen_do_ioctl(struct ugen_softc *, int, u_long,
-			 caddr_t, int, usb_proc_ptr);
+			 caddr_t, int, struct proc *);
 int ugen_set_config(struct ugen_softc *sc, int configno);
 usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc,
 					       int index, int *lenp);
@@ -261,7 +261,7 @@ ugen_set_config(struct ugen_softc *sc, int configno)
 }
 
 int
-ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct ugen_softc *sc;
 	int unit = UGENUNIT(dev);
@@ -405,7 +405,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-ugenclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	int endpt = UGENENDPOINT(dev);
 	struct ugen_softc *sc;
@@ -986,7 +986,7 @@ ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx)
 
 int
 ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
-	      caddr_t addr, int flag, usb_proc_ptr p)
+	      caddr_t addr, int flag, struct proc *p)
 {
 	struct ugen_endpoint *sce;
 	usbd_status err;
@@ -1256,7 +1256,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
 }
 
 int
-ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	int endpt = UGENENDPOINT(dev);
 	struct ugen_softc *sc;
@@ -1272,7 +1272,7 @@ ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
 }
 
 int
-ugenpoll(dev_t dev, int events, usb_proc_ptr p)
+ugenpoll(dev_t dev, int events, struct proc *p)
 {
 	struct ugen_softc *sc;
 	struct ugen_endpoint *sce;
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 99b907aed38..12a811a1879 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.38 2007/06/11 12:36:52 mbalmer Exp $ */
+/*	$OpenBSD: uhid.c,v 1.39 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -88,7 +88,7 @@ struct uhid_softc {
 
 	struct clist sc_q;
 	struct selinfo sc_rsel;
-	usb_proc_ptr sc_async;	/* process that wants SIGIO */
+	struct proc *sc_async;	/* process that wants SIGIO */
 	u_char sc_state;	/* driver state */
 #define	UHID_ASLP	0x01	/* waiting for device data */
 #define UHID_IMMED	0x02	/* return read data immediately */
@@ -106,7 +106,7 @@ void uhid_intr(struct uhidev *, void *, u_int len);
 int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
 int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
 int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int,
-			 usb_proc_ptr);
+			 struct proc *);
 
 USB_DECLARE_DRIVER(uhid);
 
@@ -233,7 +233,7 @@ uhid_intr(struct uhidev *addr, void *data, u_int len)
 }
 
 int
-uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct uhid_softc *sc;
 	int error;
@@ -265,7 +265,7 @@ uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct uhid_softc *sc;
 
@@ -398,7 +398,7 @@ uhidwrite(dev_t 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)
+	      int flag, struct proc *p)
 {
 	struct usb_ctl_report_desc *rd;
 	struct usb_ctl_report *re;
@@ -512,7 +512,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
 }
 
 int
-uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct uhid_softc *sc;
 	int error;
@@ -527,7 +527,7 @@ uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
 }
 
 int
-uhidpoll(dev_t dev, int events, usb_proc_ptr p)
+uhidpoll(dev_t dev, int events, struct proc *p)
 {
 	struct uhid_softc *sc;
 	int revents = 0;
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 039a0fb901f..7294f117842 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukbd.c,v 1.33 2007/06/10 14:49:01 mbalmer Exp $	*/
+/*	$OpenBSD: ukbd.c,v 1.34 2007/06/11 16:30:31 mbalmer Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -311,7 +311,7 @@ void	ukbd_delayed_decode(void *addr);
 int	ukbd_enable(void *, int);
 void	ukbd_set_leds(void *, int);
 
-int	ukbd_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr );
+int	ukbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
 #ifdef WSDISPLAY_COMPAT_RAWKBD
 void	ukbd_rawrepeat(void *v);
 #endif
@@ -780,7 +780,7 @@ ukbd_rawrepeat(void *v)
 #endif
 
 int
-ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct ukbd_softc *sc = v;
 
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index b70896e4913..18b00a8d4b1 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.29 2007/06/11 12:36:52 mbalmer Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.30 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -415,7 +415,7 @@ int ulptusein = 1;
  * Reset the printer, then wait until it's selected and not busy.
  */
 int
-ulptopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	u_char flags = ULPTFLAGS(dev);
 	struct ulpt_softc *sc;
@@ -540,7 +540,7 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
 }
 
 int
-ulptclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct ulpt_softc *sc;
 
@@ -630,7 +630,7 @@ ulptwrite(dev_t dev, struct uio *uio, int flags)
 }
 
 int
-ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	int error = 0;
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index cbb8205da3d..fdc836953af 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.29 2007/06/10 14:49:01 mbalmer Exp $ */
+/*	$OpenBSD: umodem.c,v 1.30 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -134,7 +134,7 @@ void	umodem_rts(struct umodem_softc *, int);
 void	umodem_break(struct umodem_softc *, int);
 void	umodem_set_line_state(struct umodem_softc *);
 int	umodem_param(void *, int, struct termios *);
-int	umodem_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
+int	umodem_ioctl(void *, int, u_long, caddr_t, int, struct proc *);
 int	umodem_open(void *, int portno);
 void	umodem_close(void *, int portno);
 void	umodem_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
@@ -541,7 +541,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 proc *p)
 {
 	struct umodem_softc *sc = addr;
 	int error = 0;
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 8cc3d9ab7d3..21c8b13ad8f 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ums.c,v 1.22 2007/06/10 14:49:01 mbalmer Exp $ */
+/*	$OpenBSD: ums.c,v 1.23 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -116,7 +116,7 @@ void ums_intr(struct uhidev *addr, void *ibuf, u_int len);
 
 int	ums_enable(void *);
 void	ums_disable(void *);
-int	ums_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr);
+int	ums_ioctl(void *, u_long, caddr_t, int, struct proc *);
 
 const struct wsmouse_accessops ums_accessops = {
 	ums_enable,
@@ -372,7 +372,7 @@ ums_disable(void *v)
 }
 
 int
-ums_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ums_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 
 {
 	switch (cmd) {
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index bc0d70fdcf9..6bb367cd666 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.39 2007/06/10 14:49:01 mbalmer Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.40 2007/06/11 16:30:31 mbalmer Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ void uplcom_break(struct uplcom_softc *, int);
 void uplcom_set_line_state(struct uplcom_softc *);
 void uplcom_get_status(void *, int portno, u_char *lsr, u_char *msr);
 #if TODO
-int  uplcom_ioctl(void *, int, u_long, caddr_t, int, usb_proc_ptr);
+int  uplcom_ioctl(void *, int, u_long, caddr_t, int, struct proc *);
 #endif
 int  uplcom_param(void *, int, struct termios *);
 int  uplcom_open(void *, int);
@@ -815,7 +815,7 @@ uplcom_get_status(void *addr, int portno, u_char *lsr, u_char *msr)
 #if TODO
 int
 uplcom_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag,
-	     usb_proc_ptr p)
+	     struct proc *p)
 {
 	struct uplcom_softc *sc = addr;
 	int error = 0;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 21117ac6501..32e6460d5fa 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.29 2007/06/11 12:36:52 mbalmer Exp $	*/
+/*	$OpenBSD: urio.c,v 1.30 2007/06/11 16:30:31 mbalmer Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -247,7 +247,7 @@ urio_activate(device_ptr_t self, enum devact act)
 }
 
 int
-urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct urio_softc *sc;
 	usbd_status err;
@@ -284,7 +284,7 @@ urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-urioclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct urio_softc *sc;
 	sc = urio_cd.cd_devs[URIOUNIT(dev)];
@@ -426,7 +426,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag)
 
 
 int
-urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct urio_softc * sc;
 	int unit = URIOUNIT(dev);
@@ -521,7 +521,7 @@ ret:
 }
 
 int
-uriopoll(dev_t dev, int events, usb_proc_ptr p)
+uriopoll(dev_t dev, int events, struct proc *p)
 {
 	return (0);
 }
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 2d0e6385471..720297f1ce0 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.51 2007/06/11 12:36:52 mbalmer Exp $	*/
+/*	$OpenBSD: usb.c,v 1.52 2007/06/11 16:30:31 mbalmer Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ struct usb_softc {
 	usbd_bus_handle sc_bus;		/* USB controller */
 	struct usbd_port sc_port;	/* dummy port for root hub */
 
-	usb_proc_ptr	sc_event_thread;
+	struct proc *	sc_event_thread;
 
 	char		sc_dying;
 };
@@ -111,7 +111,7 @@ void	usb_discover(void *);
 void	usb_create_event_thread(void *);
 void	usb_event_thread(void *);
 void	usb_task_thread(void *);
-usb_proc_ptr usb_task_thread_proc = NULL;
+struct proc *usb_task_thread_proc = NULL;
 
 #define USB_MAX_EVENTS 100
 struct usb_event_q {
@@ -122,7 +122,7 @@ SIMPLEQ_HEAD(, usb_event_q) usb_events =
 	SIMPLEQ_HEAD_INITIALIZER(usb_events);
 int usb_nevents = 0;
 struct selinfo usb_selevent;
-usb_proc_ptr usb_async_proc;  /* process that wants USB SIGIO */
+struct proc *usb_async_proc;  /* process that wants USB SIGIO */
 int usb_dev_open = 0;
 void usb_add_event(int, struct usb_event *);
 
@@ -373,7 +373,7 @@ usbctlprint(void *aux, const char *pnp)
 }
 
 int
-usbopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbopen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	int unit = minor(dev);
 	struct usb_softc *sc;
@@ -432,7 +432,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
 }
 
 int
-usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	int unit = minor(dev);
 
@@ -445,7 +445,7 @@ usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct usb_softc *sc;
 	int unit = minor(devt);
@@ -572,7 +572,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 }
 
 int
-usbpoll(dev_t dev, int events, usb_proc_ptr p)
+usbpoll(dev_t dev, int events, struct proc *p)
 {
 	int revents, mask, s;
 
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 39839e1081b..ce787d2b1ec 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.84 2007/06/11 12:36:53 mbalmer Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.85 2007/06/11 16:30:31 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 $	*/
 
@@ -60,8 +60,6 @@
 #define	PQUIRK_NOSENSE		ADEV_NOSENSE	/* can't REQUEST SENSE */
 #define PQUIRK_ONLYBIG		SDEV_ONLYBIG
 
-typedef struct proc *usb_proc_ptr;
-
 #define UCOMBUSCF_PORTNO		0
 #define UCOMBUSCF_PORTNO_DEFAULT	-1
 #define UHIDBUSCF_REPORTID		0
diff --git a/sys/dev/usb/usbf.c b/sys/dev/usb/usbf.c
index a4a59d56e21..6e1a2577ca2 100644
--- a/sys/dev/usb/usbf.c
+++ b/sys/dev/usb/usbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbf.c,v 1.6 2007/06/10 14:49:01 mbalmer Exp $	*/
+/*	$OpenBSD: usbf.c,v 1.7 2007/06/11 16:30:31 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -75,7 +75,7 @@ struct usbf_softc {
 	struct device	 sc_dev;	/* base device */
 	usbf_bus_handle	 sc_bus;	/* USB device controller */
 	struct usbf_port sc_port;	/* dummy port for function */
-	usb_proc_ptr	 sc_proc;	/* task thread */
+	struct proc *	 sc_proc;	/* task thread */
 	TAILQ_HEAD(,usbf_task) sc_tskq;	/* task queue head */
 	int		 sc_dying;
 };
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 6e22ecdda4f..4139beeb12a 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.32 2007/06/11 12:36:53 mbalmer Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.33 2007/06/11 16:30:31 mbalmer Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -324,7 +324,7 @@ uscanner_attach(struct device *parent, struct device *self, void *aux)
 }
 
 int
-uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscanneropen(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct uscanner_softc *sc;
 	int unit = USCANNERUNIT(dev);
@@ -391,7 +391,7 @@ uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
 }
 
 int
-uscannerclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscannerclose(dev_t dev, int flag, int mode, struct proc *p)
 {
 	struct uscanner_softc *sc;
 
@@ -609,7 +609,7 @@ uscanner_detach(struct device *self, int flags)
 }
 
 int
-uscannerpoll(dev_t dev, int events, usb_proc_ptr p)
+uscannerpoll(dev_t dev, int events, struct proc *p)
 {
 	struct uscanner_softc *sc;
 	int revents = 0;
@@ -631,7 +631,7 @@ uscannerpoll(dev_t dev, int events, usb_proc_ptr p)
 }
 
 int
-uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	return (EINVAL);
 }