Back out the previous change to the queue(3) interface.

It was not discussed and should probably not happen.

Requested by:		msmith and others

6 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 11c3394..8d37778 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -51,7 +51,7 @@ typedef struct ohci_soft_td {
 	struct ohci_soft_td *nexttd; /* mirrors nexttd in TD */
 	struct ohci_soft_td *dnext; /* next in done list */
 	ohci_physaddr_t physaddr;
-	LIST_ENTRY(struct ohci_soft_td) hnext;
+	LIST_ENTRY(ohci_soft_td) hnext;
 	usbd_xfer_handle xfer;
 	u_int16_t len;
 	u_int16_t flags;
@@ -97,7 +97,7 @@ typedef struct ohci_softc {
 	ohci_soft_ed_t *sc_ctrl_head;
 	ohci_soft_ed_t *sc_bulk_head;
 
-	LIST_HEAD(, struct ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
+	LIST_HEAD(, ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
 
 	int sc_noport;
 	u_int8_t sc_addr;		/* device address */
@@ -107,7 +107,7 @@ typedef struct ohci_softc {
 	ohci_soft_td_t *sc_freetds;
 	ohci_soft_itd_t *sc_freeitds;
 
-	SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
+	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 
 	usbd_xfer_handle sc_intrxfer;
 
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 62fdb9f..f266570 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -147,7 +147,7 @@ struct uhci_pipe {
  * The uhci_intr_info free list can be global since they contain
  * no dma specific data.  The other free lists do.
  */
-LIST_HEAD(, struct uhci_intr_info) uhci_ii_free;
+LIST_HEAD(, uhci_intr_info) uhci_ii_free;
 
 Static void		uhci_busreset __P((uhci_softc_t *));
 Static usbd_status	uhci_run __P((uhci_softc_t *, int run));
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index bea26bc..303a429 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -73,7 +73,7 @@ typedef struct uhci_intr_info {
 	usbd_xfer_handle xfer;
 	uhci_soft_td_t *stdstart;
 	uhci_soft_td_t *stdend;
-	LIST_ENTRY(struct uhci_intr_info) list;
+	LIST_ENTRY(uhci_intr_info) list;
 #if defined(__FreeBSD__)
 	struct callout_handle timeout_handle;
 #endif /* defined(__FreeBSD__) */
@@ -149,7 +149,7 @@ typedef struct uhci_softc {
 	uhci_soft_td_t *sc_freetds;	/* TD free list */
 	uhci_soft_qh_t *sc_freeqhs;	/* QH free list */
 
-	SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
+	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 
 	u_int8_t sc_addr;		/* device address */
 	u_int8_t sc_conf;		/* device configuration */
@@ -157,7 +157,7 @@ typedef struct uhci_softc {
 	char sc_isreset;
 	char sc_suspend;
 
-	LIST_HEAD(, struct uhci_intr_info) sc_intrhead;
+	LIST_HEAD(, uhci_intr_info) sc_intrhead;
 
 	/* Info for the root hub interrupt channel. */
 	int sc_ival;			/* time between root hug intrs */
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 43c2351..b623cf2 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -156,9 +156,9 @@ Static void	usb_event_thread __P((void *));
 #define USB_MAX_EVENTS 50
 struct usb_event_q {
 	struct usb_event ue;
-	SIMPLEQ_ENTRY(struct usb_event_q) next;
+	SIMPLEQ_ENTRY(usb_event_q) next;
 };
-Static SIMPLEQ_HEAD(, struct usb_event_q) usb_events =
+Static SIMPLEQ_HEAD(, usb_event_q) usb_events =
 	SIMPLEQ_HEAD_INITIALIZER(usb_events);
 Static int usb_nevents = 0;
 Static struct selinfo usb_selevent;
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 37c65ba..f74e9c4 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -48,7 +48,7 @@ typedef struct usb_dma_block {
         size_t size;
         size_t align;
 	int fullblock;
-	LIST_ENTRY(struct usb_dma_block) next;
+	LIST_ENTRY(usb_dma_block) next;
 } usb_dma_block_t;
 
 #define DMAADDR(dma, offset) ((dma)->block->segs[0].ds_addr + (dma)->offs + (offset))
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index ca1fae6..9d8ca8a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -146,7 +146,7 @@ struct usbd_interface {
 	int			altindex;
 	struct usbd_endpoint   *endpoints;
 	void		       *priv;
-	LIST_HEAD(, struct usbd_pipe)	pipes;
+	LIST_HEAD(, usbd_pipe)	pipes;
 };
 
 struct usbd_pipe {
@@ -155,8 +155,8 @@ struct usbd_pipe {
 	struct usbd_endpoint   *endpoint;
 	int			refcnt;
 	char			running;
-	SIMPLEQ_HEAD(, struct usbd_xfer) queue;
-	LIST_ENTRY(struct usbd_pipe)	next;
+	SIMPLEQ_HEAD(, usbd_xfer) queue;
+	LIST_ENTRY(usbd_pipe)	next;
 
 	usbd_xfer_handle	intrxfer; /* used for repeating requests */
 	char			repeat;
@@ -194,7 +194,7 @@ struct usbd_xfer {
 #define URQ_AUTO_DMABUF	0x10
 #define URQ_DEV_DMABUF	0x20
 
-	SIMPLEQ_ENTRY(struct usbd_xfer) next;
+	SIMPLEQ_ENTRY(usbd_xfer) next;
 
 	void		       *hcpriv; /* private use by the HC driver */
 	int			hcprivint;