From: Greg KH To: linux-usb-devel@lists.sourceforge.net Subject: [PATCH] urb_t removal Hi all, Here's a patch against 2.5.3-pre1 that removes the urb_t typedef from usb.h, and fixes all places in the kernel tree that had been using it. Any complaints? :) thanks, greg k-h diff -Nru a/arch/cris/drivers/usb-host.c b/arch/cris/drivers/usb-host.c --- a/arch/cris/drivers/usb-host.c Fri Jan 18 10:19:43 2002 +++ b/arch/cris/drivers/usb-host.c Fri Jan 18 10:19:43 2002 @@ -192,15 +192,15 @@ static USB_EP_Desc_t TxIntrEPList[MAX_INTR_INTERVAL] __attribute__ ((aligned (4))); static USB_SB_Desc_t TxIntrSB_zout __attribute__ ((aligned (4))); -static urb_t *URB_List[NBR_OF_EP_DESC]; +static struct urb *URB_List[NBR_OF_EP_DESC]; static kmem_cache_t *usb_desc_cache; static struct usb_bus *etrax_usb_bus; static void dump_urb (struct urb *urb); static void init_rx_buffers(void); -static int etrax_rh_unlink_urb (urb_t *urb); -static void etrax_rh_send_irq(urb_t *urb); -static void etrax_rh_init_int_timer(urb_t *urb); +static int etrax_rh_unlink_urb (struct urb *urb); +static void etrax_rh_send_irq(struct urb *urb); +static void etrax_rh_init_int_timer(struct urb *urb); static void etrax_rh_int_timer_do(unsigned long ptr); static void etrax_usb_setup_epid(char epid, char devnum, char endpoint, @@ -210,13 +210,13 @@ static void etrax_usb_free_epid(char epid); static void cleanup_sb(USB_SB_Desc_t *sb); -static int etrax_usb_do_ctrl_hw_add(urb_t *urb, char epid, char maxlen); -static int etrax_usb_do_bulk_hw_add(urb_t *urb, char epid, char maxlen); +static int etrax_usb_do_ctrl_hw_add(struct urb *urb, char epid, char maxlen); +static int etrax_usb_do_bulk_hw_add(struct urb *urb, char epid, char maxlen); -static int etrax_usb_submit_ctrl_urb(urb_t *urb); +static int etrax_usb_submit_ctrl_urb(struct urb *urb); -static int etrax_usb_submit_urb(urb_t *urb); -static int etrax_usb_unlink_urb(urb_t *urb); +static int etrax_usb_submit_urb(struct urb *urb); +static int etrax_usb_unlink_urb(struct urb *urb); static int etrax_usb_get_frame_number(struct usb_device *usb_dev); static int etrax_usb_allocate_dev(struct usb_device *usb_dev); static int etrax_usb_deallocate_dev(struct usb_device *usb_dev); @@ -225,7 +225,7 @@ static void etrax_usb_rx_interrupt(int irq, void *vhc, struct pt_regs *regs); static void etrax_usb_hc_intr_top_half(int irq, void *vhc, struct pt_regs *regs); -static int etrax_rh_submit_urb (urb_t *urb); +static int etrax_rh_submit_urb (struct urb *urb); static int etrax_usb_hc_init(void); static void etrax_usb_hc_cleanup(void); @@ -421,7 +421,7 @@ } -static int etrax_usb_unlink_intr_urb(urb_t *urb) +static int etrax_usb_unlink_intr_urb(struct urb *urb) { struct usb_device *usb_dev = urb->dev; etrax_hc_t *hc = usb_dev->bus->hcpriv; @@ -512,7 +512,7 @@ } while (tmp_ep != first_ep); } -static int etrax_usb_submit_intr_urb(urb_t *urb) +static int etrax_usb_submit_intr_urb(struct urb *urb) { USB_EP_Desc_t *tmp_ep; USB_EP_Desc_t *first_ep; @@ -643,7 +643,7 @@ static int handle_intr_transfer_attn(char epid, int status) { - urb_t *old_urb; + struct urb *old_urb; DBFENTER; @@ -696,7 +696,7 @@ DBFEXIT; } -static int etrax_rh_unlink_urb (urb_t *urb) +static int etrax_rh_unlink_urb (struct urb *urb) { etrax_hc_t *hc; @@ -713,7 +713,7 @@ return 0; } -static void etrax_rh_send_irq(urb_t *urb) +static void etrax_rh_send_irq(struct urb *urb) { __u16 data = 0; etrax_hc_t *hc = urb->dev->bus->hcpriv; @@ -746,7 +746,7 @@ /* DBFEXIT; */ } -static void etrax_rh_init_int_timer(urb_t *urb) +static void etrax_rh_init_int_timer(struct urb *urb) { etrax_hc_t *hc; @@ -765,12 +765,12 @@ static void etrax_rh_int_timer_do(unsigned long ptr) { - urb_t *urb; + struct urb *urb; etrax_hc_t *hc; /* DBFENTER; */ - urb = (urb_t*)ptr; + urb = (struct urb *)ptr; hc = urb->dev->bus->hcpriv; if (hc->rh.send) { @@ -904,7 +904,7 @@ return -1; } -static int etrax_usb_submit_bulk_urb(urb_t *urb) +static int etrax_usb_submit_bulk_urb(struct urb *urb) { char epid; char devnum; @@ -912,7 +912,7 @@ char maxlen; char slow; - urb_t *tmp_urb; + struct urb *tmp_urb; etrax_urb_priv_t *urb_priv; unsigned long flags; @@ -962,7 +962,7 @@ return 0; } -static int etrax_usb_do_bulk_hw_add(urb_t *urb, char epid, char maxlen) +static int etrax_usb_do_bulk_hw_add(struct urb *urb, char epid, char maxlen) { USB_SB_Desc_t *sb_desc_1; @@ -1080,7 +1080,7 @@ static int handle_bulk_transfer_attn(char epid, int status) { - urb_t *old_urb; + struct urb *old_urb; etrax_urb_priv_t *hc_priv; unsigned long flags; @@ -1159,7 +1159,7 @@ /* ---------------------------------------------------------------------------- */ -static int etrax_usb_submit_ctrl_urb(urb_t *urb) +static int etrax_usb_submit_ctrl_urb(struct urb *urb) { char epid; char devnum; @@ -1167,7 +1167,7 @@ char maxlen; char slow; - urb_t *tmp_urb; + struct urb *tmp_urb; etrax_urb_priv_t *urb_priv; unsigned long flags; @@ -1217,7 +1217,7 @@ return 0; } -static int etrax_usb_do_ctrl_hw_add(urb_t *urb, char epid, char maxlen) +static int etrax_usb_do_ctrl_hw_add(struct urb *urb, char epid, char maxlen) { USB_SB_Desc_t *sb_desc_1; USB_SB_Desc_t *sb_desc_2; @@ -1358,7 +1358,7 @@ DBFEXIT; } -static int etrax_usb_submit_urb(urb_t *urb) +static int etrax_usb_submit_urb(struct urb *urb) { etrax_hc_t *hc; int rval = -EINVAL; @@ -1403,7 +1403,7 @@ return rval; } -static int etrax_usb_unlink_urb(urb_t *urb) +static int etrax_usb_unlink_urb(struct urb *urb) { etrax_hc_t *hc = urb->dev->bus->hcpriv; int epid; @@ -1448,7 +1448,7 @@ cli(); for (epid = 0; epid < 32; epid++) { - urb_t *u = URB_List[epid]; + struct urb *u = URB_List[epid]; pos = 0; for (; u; u = u->next) { @@ -1474,7 +1474,7 @@ URB_List[epid] = u->next; } else { - urb_t *up; + struct urb *up; for (up = URB_List[epid]; up->next != u; up = up->next); up->next = u->next; } @@ -1522,7 +1522,7 @@ etrax_hc_t *hc = (etrax_hc_t *)vhc; int epid; char eol; - urb_t *urb; + struct urb *urb; USB_EP_Desc_t *tmp_ep; USB_SB_Desc_t *tmp_sb; @@ -1551,7 +1551,7 @@ static void etrax_usb_rx_interrupt(int irq, void *vhc, struct pt_regs *regs) { int epid = 0; - urb_t *urb; + struct urb *urb; etrax_urb_priv_t *urb_priv; *R_DMA_CH9_CLR_INTR = IO_STATE(R_DMA_CH9_CLR_INTR, clr_eop, do); @@ -1649,7 +1649,7 @@ static int handle_control_transfer_attn(char epid, int status) { - urb_t *old_urb; + struct urb *old_urb; etrax_urb_priv_t *hc_priv; DBFENTER; @@ -1710,7 +1710,7 @@ static void etrax_usb_hc_intr_bottom_half(void *data) { struct usb_reg_context *reg = (struct usb_reg_context *)data; - urb_t *old_urb; + struct urb *old_urb; int error_code; int epid; @@ -1976,7 +1976,7 @@ DBFEXIT; } -static int etrax_rh_submit_urb(urb_t *urb) +static int etrax_rh_submit_urb(struct urb *urb) { struct usb_device *usb_dev = urb->dev; etrax_hc_t *hc = usb_dev->bus->hcpriv; diff -Nru a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h --- a/drivers/isdn/hisax/st5481.h Fri Jan 18 10:19:43 2002 +++ b/drivers/isdn/hisax/st5481.h Fri Jan 18 10:19:43 2002 @@ -478,7 +478,7 @@ if (level & __debug_variable) dump_iso_packet(__FUNCTION__,urb) static void __attribute__((unused)) -dump_iso_packet(const char *name,urb_t *urb) +dump_iso_packet(const char *name, struct urb *urb) { int i,j; int len,ofs; diff -Nru a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c --- a/drivers/isdn/hisax/st5481_usb.c Fri Jan 18 10:19:43 2002 +++ b/drivers/isdn/hisax/st5481_usb.c Fri Jan 18 10:19:43 2002 @@ -235,7 +235,7 @@ struct usb_interface_descriptor *altsetting; struct usb_endpoint_descriptor *endpoint; int status; - urb_t *urb; + struct urb *urb; u_char *buf; DBG(1,""); diff -Nru a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c --- a/drivers/media/video/cpia_usb.c Fri Jan 18 10:19:43 2002 +++ b/drivers/media/video/cpia_usb.c Fri Jan 18 10:19:43 2002 @@ -46,7 +46,7 @@ struct cpia_sbuf { char *data; - urb_t *urb; + struct urb *urb; }; #define FRAMEBUF_LEN (CPIA_MAX_FRAME_SIZE+100) @@ -168,7 +168,7 @@ static int cpia_usb_open(void *privdata) { struct usb_cpia *ucpia = (struct usb_cpia *) privdata; - urb_t *urb; + struct urb *urb; int ret, retval = 0, fx, err; if (!ucpia) diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c --- a/drivers/usb/audio.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/audio.c Fri Jan 18 10:19:43 2002 @@ -297,12 +297,12 @@ #define FLG_CONNECTED 32 struct my_data_urb { - urb_t urb; + struct urb urb; struct usb_iso_packet_descriptor isoframe[DESCFRAMES]; }; struct my_sync_urb { - urb_t urb; + struct urb urb; struct usb_iso_packet_descriptor isoframe[SYNCFRAMES]; }; diff -Nru a/drivers/usb/auerswald.c b/drivers/usb/auerswald.c --- a/drivers/usb/auerswald.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/auerswald.c Fri Jan 18 10:19:43 2002 @@ -176,7 +176,7 @@ typedef struct { struct auerchain *chain; /* pointer to the chain to which this element belongs */ - urb_t * urbp; /* pointer to attached urb */ + struct urb * urbp; /* pointer to attached urb */ void *context; /* saved URB context */ usb_complete_t complete; /* saved URB completion function */ struct list_head list; /* to include element into a list */ @@ -200,7 +200,7 @@ unsigned int len; /* number of characters in data buffer */ unsigned int retries; /* for urb retries */ struct usb_ctrlrequest *dr; /* for setup data in control messages */ - urb_t * urbp; /* USB urb */ + struct urb * urbp; /* USB urb */ struct auerbufctl *list; /* pointer to list */ struct list_head buff_list; /* reference to next buffer in list */ } auerbuf_t,*pauerbuf_t; @@ -237,7 +237,7 @@ int open_count; /* count the number of open character channels */ char dev_desc[AUSI_DLEN];/* for storing a textual description */ unsigned int maxControlLength; /* max. Length of control paket (without header) */ - urb_t * inturbp; /* interrupt urb */ + struct urb * inturbp; /* interrupt urb */ char * intbufp; /* data buffer for interrupt urb */ unsigned int irqsize; /* size of interrupt endpoint 1 */ struct auerchain controlchain; /* for chaining of control messages */ @@ -274,7 +274,7 @@ /*-------------------------------------------------------------------*/ /* Forwards */ -static void auerswald_ctrlread_complete (urb_t * urb); +static void auerswald_ctrlread_complete (struct urb * urb); static void auerswald_removeservice (pauerswald_t cp, pauerscon_t scp); @@ -283,7 +283,7 @@ /* -------------------------- */ /* completion function for chained urbs */ -static void auerchain_complete (urb_t * urb) +static void auerchain_complete (struct urb * urb) { unsigned long flags; int result; @@ -350,7 +350,7 @@ this function may be called from completion context or from user space! early = 1 -> submit in front of chain */ -static int auerchain_submit_urb_list (pauerchain_t acp, urb_t * urb, int early) +static int auerchain_submit_urb_list (pauerchain_t acp, struct urb * urb, int early) { int result; unsigned long flags; @@ -424,7 +424,7 @@ /* submit function for chained urbs this function may be called from completion context or from user space! */ -static int auerchain_submit_urb (pauerchain_t acp, urb_t * urb) +static int auerchain_submit_urb (pauerchain_t acp, struct urb * urb) { return auerchain_submit_urb_list (acp, urb, 0); } @@ -433,10 +433,10 @@ the result is 0 if the urb is cancelled, or -EINPROGRESS if USB_ASYNC_UNLINK is set and the function is successfully started. */ -static int auerchain_unlink_urb (pauerchain_t acp, urb_t * urb) +static int auerchain_unlink_urb (pauerchain_t acp, struct urb * urb) { unsigned long flags; - urb_t * urbp; + struct urb * urbp; pauerchainelement_t acep; struct list_head *tmp; @@ -492,7 +492,7 @@ static void auerchain_unlink_all (pauerchain_t acp) { unsigned long flags; - urb_t * urbp; + struct urb * urbp; pauerchainelement_t acep; dbg ("auerchain_unlink_all called"); @@ -598,7 +598,7 @@ /* completion handler for synchronous chained URBs */ -static void auerchain_blocking_completion (urb_t *urb) +static void auerchain_blocking_completion (struct urb *urb) { wait_queue_head_t *wakeup = (wait_queue_head_t *)urb->context; wake_up (wakeup); @@ -606,7 +606,7 @@ /* Starts chained urb and waits for completion or timeout */ -static int auerchain_start_wait_urb (pauerchain_t acp, urb_t *urb, int timeout, int* actual_length) +static int auerchain_start_wait_urb (pauerchain_t acp, struct urb *urb, int timeout, int* actual_length) { DECLARE_WAITQUEUE (wait, current); DECLARE_WAIT_QUEUE_HEAD (wqh); @@ -675,7 +675,7 @@ { int ret; struct usb_ctrlrequest *dr; - urb_t *urb; + struct urb *urb; int length; dbg ("auerchain_control_msg"); @@ -858,7 +858,7 @@ } /* Completion of asynchronous write block */ -static void auerchar_ctrlwrite_complete (urb_t * urb) +static void auerchar_ctrlwrite_complete (struct urb * urb) { pauerbuf_t bp = (pauerbuf_t) urb->context; pauerswald_t cp = ((pauerswald_t)((char *)(bp->list)-(unsigned long)(&((pauerswald_t)0)->bufctl))); @@ -871,7 +871,7 @@ } /* Completion handler for dummy retry packet */ -static void auerswald_ctrlread_wretcomplete (urb_t * urb) +static void auerswald_ctrlread_wretcomplete (struct urb * urb) { pauerbuf_t bp = (pauerbuf_t) urb->context; pauerswald_t cp; @@ -910,7 +910,7 @@ } /* completion handler for receiving of control messages */ -static void auerswald_ctrlread_complete (urb_t * urb) +static void auerswald_ctrlread_complete (struct urb * urb) { unsigned int serviceid; pauerswald_t cp; @@ -980,7 +980,7 @@ messages from the USB device. */ /* int completion handler. */ -static void auerswald_int_complete (urb_t * urb) +static void auerswald_int_complete (struct urb * urb) { unsigned long flags; unsigned int channelid; diff -Nru a/drivers/usb/devio.c b/drivers/usb/devio.c --- a/drivers/usb/devio.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/devio.c Fri Jan 18 10:19:43 2002 @@ -53,7 +53,7 @@ unsigned int signr; void *userbuffer; void *userurb; - urb_t urb; + struct urb urb; }; static loff_t usbdev_lseek(struct file *file, loff_t offset, int orig) diff -Nru a/drivers/usb/ibmcam.h b/drivers/usb/ibmcam.h --- a/drivers/usb/ibmcam.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/ibmcam.h Fri Jan 18 10:19:43 2002 @@ -147,7 +147,7 @@ struct ibmcam_sbuf { char *data; - urb_t *urb; + struct urb *urb; }; struct ibmcam_frame { diff -Nru a/drivers/usb/kaweth.c b/drivers/usb/kaweth.c --- a/drivers/usb/kaweth.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/kaweth.c Fri Jan 18 10:19:43 2002 @@ -953,7 +953,7 @@ /*-------------------------------------------------------------------* * completion handler for compatibility wrappers (sync control/bulk) * *-------------------------------------------------------------------*/ -static void usb_api_blocking_completion(urb_t *urb) +static void usb_api_blocking_completion(struct urb *urb) { struct usb_api_data *awd = (struct usb_api_data *)urb->context; @@ -966,7 +966,7 @@ *-------------------------------------------------------------------*/ // Starts urb and waits for completion or timeout -static int usb_start_wait_urb(urb_t *urb, int timeout, int* actual_length) +static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length) { DECLARE_WAITQUEUE(wait, current); struct usb_api_data awd; @@ -1017,7 +1017,7 @@ struct usb_ctrlrequest *cmd, void *data, int len, int timeout) { - urb_t *urb; + struct urb *urb; int retv; int length; diff -Nru a/drivers/usb/ov511.c b/drivers/usb/ov511.c --- a/drivers/usb/ov511.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/ov511.c Fri Jan 18 10:19:43 2002 @@ -3875,7 +3875,7 @@ **********************************************************************/ static int -ov511_move_data(struct usb_ov511 *ov511, urb_t *urb) +ov511_move_data(struct usb_ov511 *ov511, struct urb *urb) { unsigned char *cdata; int data_size, num, offset, i, totlen = 0; @@ -4108,7 +4108,7 @@ } static int -ov518_move_data(struct usb_ov511 *ov511, urb_t *urb) +ov518_move_data(struct usb_ov511 *ov511, struct urb *urb) { unsigned char *cdata; int i, data_size, totlen = 0; @@ -4369,7 +4369,7 @@ static int ov511_init_isoc(struct usb_ov511 *ov511) { - urb_t *urb; + struct urb *urb; int fx, err, n, size; PDEBUG(3, "*** Initializing capture ***"); diff -Nru a/drivers/usb/ov511.h b/drivers/usb/ov511.h --- a/drivers/usb/ov511.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/ov511.h Fri Jan 18 10:19:43 2002 @@ -366,7 +366,7 @@ struct ov511_sbuf { char *data; - urb_t *urb; + struct urb *urb; }; enum { diff -Nru a/drivers/usb/pegasus.c b/drivers/usb/pegasus.c --- a/drivers/usb/pegasus.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/pegasus.c Fri Jan 18 10:19:43 2002 @@ -94,7 +94,7 @@ static int update_eth_regs_async( pegasus_t * ); /* Aargh!!! I _really_ hate such tweaks */ -static void ctrl_callback( urb_t *urb ) +static void ctrl_callback( struct urb *urb ) { pegasus_t *pegasus = urb->context; diff -Nru a/drivers/usb/se401.c b/drivers/usb/se401.c --- a/drivers/usb/se401.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/se401.c Fri Jan 18 10:19:43 2002 @@ -610,7 +610,7 @@ */ static int se401_start_stream(struct usb_se401 *se401) { - urb_t *urb; + struct urb *urb; int err=0, i; se401->streaming=1; diff -Nru a/drivers/usb/se401.h b/drivers/usb/se401.h --- a/drivers/usb/se401.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/se401.h Fri Jan 18 10:19:43 2002 @@ -197,8 +197,8 @@ char *fbuf; /* Videodev buffer area */ - urb_t *urb[SE401_NUMSBUF]; - urb_t *inturb; + struct urb *urb[SE401_NUMSBUF]; + struct urb *inturb; int button; int buttonpressed; diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c --- a/drivers/usb/serial/io_edgeport.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/serial/io_edgeport.c Fri Jan 18 10:19:43 2002 @@ -2456,7 +2456,7 @@ { struct edgeport_serial *edge_serial = (struct edgeport_serial *)edge_port->port->serial->private; int status = 0; - urb_t *urb; + struct urb *urb; int timeout; usb_serial_debug_data (__FILE__, __FUNCTION__, length, buffer); diff -Nru a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c --- a/drivers/usb/serial/keyspan.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/serial/keyspan.c Fri Jan 18 10:19:43 2002 @@ -109,11 +109,11 @@ const keyspan_device_details *device_details; - urb_t *instat_urb; + struct urb *instat_urb; char instat_buf[INSTAT_BUFLEN]; /* XXX this one probably will need a lock */ - urb_t *glocont_urb; + struct urb *glocont_urb; char glocont_buf[GLOCONT_BUFLEN]; }; @@ -128,18 +128,18 @@ const keyspan_device_details *device_details; /* Input endpoints and buffer for this port */ - urb_t *in_urbs[2]; + struct urb *in_urbs[2]; char in_buffer[2][64]; /* Output endpoints and buffer for this port */ - urb_t *out_urbs[2]; + struct urb *out_urbs[2]; char out_buffer[2][64]; /* Input ack endpoint */ - urb_t *inack_urb; + struct urb *inack_urb; char inack_buffer[1]; /* Output control endpoint */ - urb_t *outcont_urb; + struct urb *outcont_urb; char outcont_buffer[64]; /* Settings for the port */ @@ -324,7 +324,7 @@ const keyspan_device_details *d_details; int flip; int left, todo; - urb_t *this_urb; + struct urb *this_urb; int err; p_priv = (struct keyspan_port_private *)(port->private); @@ -853,7 +853,7 @@ struct usb_serial *serial = port->serial; const keyspan_device_details *d_details; int i, already_active, err; - urb_t *urb; + struct urb *urb; s_priv = (struct keyspan_serial_private *)(serial->private); p_priv = (struct keyspan_port_private *)(port->private); @@ -890,7 +890,7 @@ return (0); } -static inline void stop_urb(urb_t *urb) +static inline void stop_urb(struct urb *urb) { if (urb && urb->status == -EINPROGRESS) { urb->transfer_flags &= ~USB_ASYNC_UNLINK; @@ -1041,11 +1041,11 @@ } /* Helper functions used by keyspan_setup_urbs */ -static urb_t *keyspan_setup_urb(struct usb_serial *serial, int endpoint, - int dir, void *ctx, char *buf, int len, - void (*callback)(urb_t *)) +static struct urb *keyspan_setup_urb(struct usb_serial *serial, int endpoint, + int dir, void *ctx, char *buf, int len, + void (*callback)(struct urb *)) { - urb_t *urb; + struct urb *urb; if (endpoint == -1) return NULL; /* endpoint not needed */ @@ -1066,12 +1066,12 @@ } static struct callbacks { - void (*instat_callback)(urb_t *); - void (*glocont_callback)(urb_t *); - void (*indat_callback)(urb_t *); - void (*outdat_callback)(urb_t *); - void (*inack_callback)(urb_t *); - void (*outcont_callback)(urb_t *); + void (*instat_callback)(struct urb *); + void (*glocont_callback)(struct urb *); + void (*indat_callback)(struct urb *); + void (*outdat_callback)(struct urb *); + void (*inack_callback)(struct urb *); + void (*outcont_callback)(struct urb *); } keyspan_callbacks[] = { { /* msg_usa26 callbacks */ @@ -1295,7 +1295,7 @@ struct keyspan_port_private *p_priv; const keyspan_device_details *d_details; int outcont_urb; - urb_t *this_urb; + struct urb *this_urb; int err; dbg ("%s reset=%d\n", __FUNCTION__, reset_port); @@ -1430,7 +1430,7 @@ struct keyspan_serial_private *s_priv; struct keyspan_port_private *p_priv; const keyspan_device_details *d_details; - urb_t *this_urb; + struct urb *this_urb; int err; s_priv = (struct keyspan_serial_private *)(serial->private); @@ -1516,7 +1516,7 @@ struct keyspan_port_private *p_priv; const keyspan_device_details *d_details; int glocont_urb; - urb_t *this_urb; + struct urb *this_urb; int err; int device_port; diff -Nru a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c --- a/drivers/usb/storage/transport.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/storage/transport.c Fri Jan 18 10:19:43 2002 @@ -369,7 +369,7 @@ /* This is the completion handler which will wake us up when an URB * completes. */ -static void usb_stor_blocking_completion(urb_t *urb) +static void usb_stor_blocking_completion(struct urb *urb) { struct completion *urb_done_ptr = (struct completion *)urb->context; diff -Nru a/drivers/usb/stv680.c b/drivers/usb/stv680.c --- a/drivers/usb/stv680.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/stv680.c Fri Jan 18 10:19:43 2002 @@ -766,7 +766,7 @@ static int stv680_start_stream (struct usb_stv *stv680) { - urb_t *urb; + struct urb *urb; int err = 0, i; stv680->streaming = 1; diff -Nru a/drivers/usb/stv680.h b/drivers/usb/stv680.h --- a/drivers/usb/stv680.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/stv680.h Fri Jan 18 10:19:43 2002 @@ -118,7 +118,7 @@ int removed; /* device disconnected */ int streaming; /* Are we streaming video? */ char *fbuf; /* Videodev buffer area */ - urb_t *urb[STV680_NUMSBUF]; /* # of queued bulk transfers */ + struct urb *urb[STV680_NUMSBUF]; /* # of queued bulk transfers */ int curframe; /* Current receiving frame */ struct stv680_frame frame[STV680_NUMFRAMES]; /* # frames supported by v4l part */ int readcount; diff -Nru a/drivers/usb/usb-ohci.c b/drivers/usb/usb-ohci.c --- a/drivers/usb/usb-ohci.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usb-ohci.c Fri Jan 18 10:19:43 2002 @@ -173,7 +173,7 @@ kfree (urb_priv); } -static void urb_rm_priv_locked (urb_t * urb) +static void urb_rm_priv_locked (struct urb * urb) { urb_priv_t * urb_priv = urb->hcpriv; @@ -207,7 +207,7 @@ } } -static void urb_rm_priv (urb_t * urb) +static void urb_rm_priv (struct urb * urb) { unsigned long flags; @@ -224,7 +224,7 @@ /* debug| print the main components of an URB * small: 0) header + data packets 1) just header */ -static void urb_print (urb_t * urb, char * str, int small) +static void urb_print (struct urb * urb, char * str, int small) { unsigned int pipe= urb->pipe; @@ -453,10 +453,10 @@ /* return a request to the completion handler */ -static int sohci_return_urb (struct ohci *hc, urb_t * urb) +static int sohci_return_urb (struct ohci *hc, struct urb * urb) { urb_priv_t * urb_priv = urb->hcpriv; - urb_t * urbt; + struct urb * urbt; unsigned long flags; int i; @@ -532,7 +532,7 @@ /* get a transfer request */ -static int sohci_submit_urb (urb_t * urb) +static int sohci_submit_urb (struct urb * urb) { ohci_t * ohci; ed_t * ed; @@ -716,7 +716,7 @@ /* deactivate all TDs and remove the private part of the URB */ /* interrupt callers must use async unlink mode */ -static int sohci_unlink_urb (urb_t * urb) +static int sohci_unlink_urb (struct urb * urb) { unsigned long flags; ohci_t * ohci; @@ -1295,7 +1295,7 @@ static void td_fill (ohci_t * ohci, unsigned int info, dma_addr_t data, int len, - urb_t * urb, int index) + struct urb * urb, int index) { volatile td_t * td, * td_pt; urb_priv_t * urb_priv = urb->hcpriv; @@ -1343,7 +1343,7 @@ /* prepare all TDs of a transfer */ -static void td_submit_urb (urb_t * urb) +static void td_submit_urb (struct urb * urb) { urb_priv_t * urb_priv = urb->hcpriv; ohci_t * ohci = (ohci_t *) urb->dev->bus->hcpriv; @@ -1452,7 +1452,7 @@ { __u32 tdINFO, tdBE, tdCBP; __u16 tdPSW; - urb_t * urb = td->urb; + struct urb * urb = td->urb; urb_priv_t * urb_priv = urb->hcpriv; int dlen = 0; int cc = 0; @@ -1493,7 +1493,7 @@ /* handle an urb that is being unlinked */ -static void dl_del_urb (urb_t * urb) +static void dl_del_urb (struct urb * urb) { wait_queue_head_t * wait_head = ((urb_priv_t *)(urb->hcpriv))->wait; @@ -1582,7 +1582,7 @@ td_p = &ed->hwHeadP; for (td = tdHeadP; td != tdTailP; td = td_next) { - urb_t * urb = td->urb; + struct urb * urb = td->urb; urb_priv_t * urb_priv = td->urb->hcpriv; td_next = dma_to_td (ohci, le32_to_cpup (&td->hwNextTD) & 0xfffffff0); @@ -1670,7 +1670,7 @@ td_t * td_list_next = NULL; ed_t * ed; int cc = 0; - urb_t * urb; + struct urb * urb; urb_priv_t * urb_priv; __u32 tdINFO, edHeadP, edTailP; @@ -1846,7 +1846,7 @@ { int len; - urb_t * urb = (urb_t *) ptr; + struct urb * urb = (struct urb *) ptr; ohci_t * ohci = urb->dev->bus->hcpriv; if (ohci->disabled) @@ -1875,7 +1875,7 @@ /* Root Hub INTs are polled by this timer */ -static int rh_init_int_timer (urb_t * urb) +static int rh_init_int_timer (struct urb * urb) { ohci_t * ohci = urb->dev->bus->hcpriv; @@ -1900,7 +1900,7 @@ /* request to virtual root hub */ -static int rh_submit_urb (urb_t * urb) +static int rh_submit_urb (struct urb * urb) { struct usb_device * usb_dev = urb->dev; ohci_t * ohci = usb_dev->bus->hcpriv; @@ -2106,7 +2106,7 @@ /*-------------------------------------------------------------------------*/ -static int rh_unlink_urb (urb_t * urb) +static int rh_unlink_urb (struct urb * urb) { ohci_t * ohci = urb->dev->bus->hcpriv; diff -Nru a/drivers/usb/usb-ohci.h b/drivers/usb/usb-ohci.h --- a/drivers/usb/usb-ohci.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usb-ohci.h Fri Jan 18 10:19:43 2002 @@ -111,7 +111,7 @@ __u8 index; struct ed * ed; struct td * next_dl_td; - urb_t * urb; + struct urb * urb; dma_addr_t td_dma; dma_addr_t data_dma; @@ -430,12 +430,12 @@ static ed_t * ep_add_ed(struct usb_device * usb_dev, unsigned int pipe, int interval, int load, int mem_flags); static void ep_rm_ed(struct usb_device * usb_dev, ed_t * ed); /* td */ -static void td_fill(ohci_t * ohci, unsigned int info, dma_addr_t data, int len, urb_t * urb, int index); -static void td_submit_urb(urb_t * urb); +static void td_fill(ohci_t * ohci, unsigned int info, dma_addr_t data, int len, struct urb * urb, int index); +static void td_submit_urb(struct urb * urb); /* root hub */ -static int rh_submit_urb(urb_t * urb); -static int rh_unlink_urb(urb_t * urb); -static int rh_init_int_timer(urb_t * urb); +static int rh_submit_urb(struct urb * urb); +static int rh_unlink_urb(struct urb * urb); +static int rh_init_int_timer(struct urb * urb); /*-------------------------------------------------------------------------*/ diff -Nru a/drivers/usb/usb-uhci.c b/drivers/usb/usb-uhci.c --- a/drivers/usb/usb-uhci.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usb-uhci.c Fri Jan 18 10:19:43 2002 @@ -113,12 +113,12 @@ // Suppress HC interrupt error messages for 5s #define ERROR_SUPPRESSION_TIME (HZ*5) -_static int rh_submit_urb (urb_t *urb); -_static int rh_unlink_urb (urb_t *urb); +_static int rh_submit_urb (struct urb *urb); +_static int rh_unlink_urb (struct urb *urb); _static int delete_qh (uhci_t *s, uhci_desc_t *qh); -_static int process_transfer (uhci_t *s, urb_t *urb, int mode); -_static int process_interrupt (uhci_t *s, urb_t *urb); -_static int process_iso (uhci_t *s, urb_t *urb, int force); +_static int process_transfer (uhci_t *s, struct urb *urb, int mode); +_static int process_interrupt (uhci_t *s, struct urb *urb); +_static int process_iso (uhci_t *s, struct urb *urb, int force); // How much URBs with ->next are walked #define MAX_NEXT_COUNT 2048 @@ -164,7 +164,7 @@ } /*-------------------------------------------------------------------*/ #ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH -_static void enable_desc_loop(uhci_t *s, urb_t *urb) +_static void enable_desc_loop(uhci_t *s, struct urb *urb) { int flags; @@ -179,7 +179,7 @@ spin_unlock_irqrestore (&s->qh_lock, flags); } /*-------------------------------------------------------------------*/ -_static void disable_desc_loop(uhci_t *s, urb_t *urb) +_static void disable_desc_loop(uhci_t *s, struct urb *urb) { int flags; @@ -200,7 +200,7 @@ } #endif /*-------------------------------------------------------------------*/ -_static void queue_urb_unlocked (uhci_t *s, urb_t *urb) +_static void queue_urb_unlocked (uhci_t *s, struct urb *urb) { struct list_head *p=&urb->urb_list; #ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH @@ -220,7 +220,7 @@ uhci_switch_timer_int(s); } /*-------------------------------------------------------------------*/ -_static void queue_urb (uhci_t *s, urb_t *urb) +_static void queue_urb (uhci_t *s, struct urb *urb) { unsigned long flags=0; @@ -229,7 +229,7 @@ spin_unlock_irqrestore (&s->urb_list_lock, flags); } /*-------------------------------------------------------------------*/ -_static void dequeue_urb (uhci_t *s, urb_t *urb) +_static void dequeue_urb (uhci_t *s, struct urb *urb) { #ifdef CONFIG_USB_UHCI_HIGH_BANDWIDTH int type; @@ -694,7 +694,7 @@ // LOW LEVEL STUFF // assembles QHs und TDs for control, bulk and iso /*-------------------------------------------------------------------*/ -_static int uhci_submit_control_urb (urb_t *urb) +_static int uhci_submit_control_urb (struct urb *urb) { uhci_desc_t *qh, *td; uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; @@ -811,7 +811,7 @@ // For queued bulk transfers, two additional QH helpers are allocated (nqh, bqh) // Due to the linking with other bulk urbs, it has to be locked with urb_list_lock! -_static int uhci_submit_bulk_urb (urb_t *urb, urb_t *bulk_urb) +_static int uhci_submit_bulk_urb (struct urb *urb, struct urb *bulk_urb) { uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; urb_priv_t *urb_priv = urb->hcpriv, *upriv, *bpriv=NULL; @@ -973,7 +973,7 @@ looks a bit complicated because of all the bulk queueing goodies */ -_static void uhci_clean_transfer (uhci_t *s, urb_t *urb, uhci_desc_t *qh, int mode) +_static void uhci_clean_transfer (uhci_t *s, struct urb *urb, uhci_desc_t *qh, int mode) { uhci_desc_t *bqh, *nqh, *prevqh, *prevtd; int now; @@ -1027,7 +1027,7 @@ urb, priv->prev_queued_urb, priv->next_queued_urb, qh, bqh, priv->next_qh); if (mode != CLEAN_TRANSFER_DELETION_MARK) { // no work for cleanup at unlink-completion - urb_t *nurb; + struct urb *nurb; unsigned long flags; nurb = priv->next_queued_urb; @@ -1065,7 +1065,7 @@ } /*-------------------------------------------------------------------*/ // Release bandwidth for Interrupt or Isoc. transfers -_static void uhci_release_bandwidth(urb_t *urb) +_static void uhci_release_bandwidth(struct urb *urb) { if (urb->bandwidth) { switch (usb_pipetype(urb->pipe)) { @@ -1081,7 +1081,7 @@ } } -_static void uhci_urb_dma_sync(uhci_t *s, urb_t *urb, urb_priv_t *urb_priv) +_static void uhci_urb_dma_sync(uhci_t *s, struct urb *urb, urb_priv_t *urb_priv) { if (urb_priv->setup_packet_dma) pci_dma_sync_single(s->uhci_pci, urb_priv->setup_packet_dma, @@ -1095,7 +1095,7 @@ PCI_DMA_TODEVICE); } -_static void uhci_urb_dma_unmap(uhci_t *s, urb_t *urb, urb_priv_t *urb_priv) +_static void uhci_urb_dma_unmap(uhci_t *s, struct urb *urb, urb_priv_t *urb_priv) { if (urb_priv->setup_packet_dma) { pci_unmap_single(s->uhci_pci, urb_priv->setup_packet_dma, @@ -1116,7 +1116,7 @@ mode: UNLINK_ASYNC_STORE_URB: unlink and move URB into unlinked list UNLINK_ASYNC_DONT_STORE: unlink, don't move URB into unlinked list */ -_static int uhci_unlink_urb_async (uhci_t *s,urb_t *urb, int mode) +_static int uhci_unlink_urb_async (uhci_t *s, struct urb *urb, int mode) { uhci_desc_t *qh; urb_priv_t *urb_priv; @@ -1161,7 +1161,7 @@ } /*-------------------------------------------------------------------*/ // kills an urb by unlinking descriptors and waiting for at least one frame -_static int uhci_unlink_urb_sync (uhci_t *s, urb_t *urb) +_static int uhci_unlink_urb_sync (uhci_t *s, struct urb *urb) { uhci_desc_t *qh; urb_priv_t *urb_priv; @@ -1224,7 +1224,7 @@ _static void uhci_cleanup_unlink(uhci_t *s, int force) { struct list_head *q; - urb_t *urb; + struct urb *urb; struct usb_device *dev; int now, type; urb_priv_t *urb_priv; @@ -1234,7 +1234,7 @@ while (q != &s->urb_unlinked) { - urb = list_entry (q, urb_t, urb_list); + urb = list_entry (q, struct urb, urb_list); urb_priv = (urb_priv_t*)urb->hcpriv; q = urb->urb_list.next; @@ -1303,7 +1303,7 @@ } /*-------------------------------------------------------------------*/ -_static int uhci_unlink_urb (urb_t *urb) +_static int uhci_unlink_urb (struct urb *urb) { uhci_t *s; unsigned long flags=0; @@ -1336,9 +1336,9 @@ // In case of ASAP iso transfer, search the URB-list for already queued URBs // for this EP and calculate the earliest start frame for the new // URB (easy seamless URB continuation!) -_static int find_iso_limits (urb_t *urb, unsigned int *start, unsigned int *end) +_static int find_iso_limits (struct urb *urb, unsigned int *start, unsigned int *end) { - urb_t *u, *last_urb = NULL; + struct urb *u, *last_urb = NULL; uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; struct list_head *p; int ret=-1; @@ -1348,7 +1348,7 @@ p=s->urb_list.prev; for (; p != &s->urb_list; p = p->prev) { - u = list_entry (p, urb_t, urb_list); + u = list_entry (p, struct urb, urb_list); // look for pending URBs with identical pipe handle // works only because iso doesn't toggle the data bit! if ((urb->pipe == u->pipe) && (urb->dev == u->dev) && (u->status == -EINPROGRESS)) { @@ -1370,7 +1370,7 @@ /*-------------------------------------------------------------------*/ // adjust start_frame according to scheduling constraints (ASAP etc) -_static int iso_find_start (urb_t *urb) +_static int iso_find_start (struct urb *urb) { uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; unsigned int now; @@ -1428,7 +1428,7 @@ // ASAP-flag set implicitely // if period==0, the transfer is only done once -_static int uhci_submit_int_urb (urb_t *urb) +_static int uhci_submit_int_urb (struct urb *urb) { uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; urb_priv_t *urb_priv = urb->hcpriv; @@ -1488,7 +1488,7 @@ return 0; } /*-------------------------------------------------------------------*/ -_static int uhci_submit_iso_urb (urb_t *urb) +_static int uhci_submit_iso_urb (struct urb *urb) { uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv; urb_priv_t *urb_priv = urb->hcpriv; @@ -1581,10 +1581,10 @@ /*-------------------------------------------------------------------*/ // returns: 0 (no transfer queued), urb* (this urb already queued) -_static urb_t* search_dev_ep (uhci_t *s, urb_t *urb) +_static struct urb* search_dev_ep (uhci_t *s, struct urb *urb) { struct list_head *p; - urb_t *tmp; + struct urb *tmp; unsigned int mask = usb_pipecontrol(urb->pipe) ? (~USB_DIR_IN) : (~0); dbg("search_dev_ep:"); @@ -1592,7 +1592,7 @@ p=s->urb_list.next; for (; p != &s->urb_list; p = p->next) { - tmp = list_entry (p, urb_t, urb_list); + tmp = list_entry (p, struct urb, urb_list); dbg("urb: %p", tmp); // we can accept this urb if it is not queued at this time // or if non-iso transfer requests should be scheduled for the same device and pipe @@ -1605,13 +1605,13 @@ return 0; } /*-------------------------------------------------------------------*/ -_static int uhci_submit_urb (urb_t *urb) +_static int uhci_submit_urb (struct urb *urb) { uhci_t *s; urb_priv_t *urb_priv; int ret = 0, type; unsigned long flags; - urb_t *queued_urb=NULL; + struct urb *queued_urb=NULL; int bustime; if (!urb->dev || !urb->dev->bus) @@ -1765,7 +1765,7 @@ _static void uhci_check_timeouts(uhci_t *s) { struct list_head *p,*p2; - urb_t *urb; + struct urb *urb; int type; p = s->urb_list.prev; @@ -1775,7 +1775,7 @@ p2 = p; p = p->prev; - urb = list_entry (p2, urb_t, urb_list); + urb = list_entry (p2, struct urb, urb_list); type = usb_pipetype (urb->pipe); hcpriv = (urb_priv_t*)urb->hcpriv; @@ -1875,7 +1875,7 @@ /*-------------------------------------------------------------------------*/ /* prepare Interrupt pipe transaction data; HUB INTERRUPT ENDPOINT */ -_static int rh_send_irq (urb_t *urb) +_static int rh_send_irq (struct urb *urb) { int len = 1; int i; @@ -1902,12 +1902,12 @@ /*-------------------------------------------------------------------------*/ /* Virtual Root Hub INTs are polled by this timer every "intervall" ms */ -_static int rh_init_int_timer (urb_t *urb); +_static int rh_init_int_timer (struct urb *urb); _static void rh_int_timer_do (unsigned long ptr) { int len; - urb_t *urb = (urb_t*) ptr; + struct urb *urb = (struct urb *) ptr; uhci_t *uhci = urb->dev->bus->hcpriv; if (uhci->rh.send) { @@ -1924,7 +1924,7 @@ /*-------------------------------------------------------------------------*/ /* Root Hub INTs are polled by this timer, polling interval 20ms */ -_static int rh_init_int_timer (urb_t *urb) +_static int rh_init_int_timer (struct urb *urb) { uhci_t *uhci = urb->dev->bus->hcpriv; @@ -1958,7 +1958,7 @@ *************************/ -_static int rh_submit_urb (urb_t *urb) +_static int rh_submit_urb (struct urb *urb) { struct usb_device *usb_dev = urb->dev; uhci_t *uhci = usb_dev->bus->hcpriv; @@ -2159,7 +2159,7 @@ } /*-------------------------------------------------------------------------*/ -_static int rh_unlink_urb (urb_t *urb) +_static int rh_unlink_urb (struct urb *urb) { uhci_t *uhci = urb->dev->bus->hcpriv; @@ -2217,14 +2217,14 @@ unsigned long flags; struct list_head *p; struct list_head *p2; - urb_t *urb; + struct urb *urb; spin_lock_irqsave (&s->urb_list_lock, flags); p = s->urb_list.prev; while (p != &s->urb_list) { p2 = p; p = p->prev ; - urb = list_entry (p2, urb_t, urb_list); + urb = list_entry (p2, struct urb, urb_list); dbg("urb: %p, dev %p, %p", urb, usb_dev,urb->dev); //urb->transfer_flags |=USB_ASYNC_UNLINK; @@ -2274,7 +2274,7 @@ uhci_unlink_urb }; -_static void correct_data_toggles(urb_t *urb) +_static void correct_data_toggles(struct urb *urb) { usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe), usb_pipeout (urb->pipe), !usb_gettoggle (urb->dev, usb_pipeendpoint (urb->pipe), usb_pipeout (urb->pipe))); @@ -2304,7 +2304,7 @@ * PROCESS_TRANSFER_DONT_UNLINK: QHs already unlinked (for async unlink_urb) */ -_static int process_transfer (uhci_t *s, urb_t *urb, int mode) +_static int process_transfer (uhci_t *s, struct urb *urb, int mode) { int ret = 0; urb_priv_t *urb_priv = urb->hcpriv; @@ -2392,7 +2392,7 @@ if (usb_pipetype (urb->pipe) == PIPE_BULK ) { /* toggle correction for short bulk transfers (nonqueued/queued) */ urb_priv_t *priv=(urb_priv_t*)urb->hcpriv; - urb_t *next_queued_urb=priv->next_queued_urb; + struct urb *next_queued_urb=priv->next_queued_urb; if (next_queued_urb) { urb_priv_t *next_priv=(urb_priv_t*)next_queued_urb->hcpriv; @@ -2423,7 +2423,7 @@ return ret; } -_static int process_interrupt (uhci_t *s, urb_t *urb) +_static int process_interrupt (uhci_t *s, struct urb *urb) { int i, ret = -EINPROGRESS; urb_priv_t *urb_priv = urb->hcpriv; @@ -2520,7 +2520,7 @@ // mode: PROCESS_ISO_REGULAR: processing only for done TDs, unlink TDs // mode: PROCESS_ISO_FORCE: force processing, don't unlink TDs (already unlinked) -_static int process_iso (uhci_t *s, urb_t *urb, int mode) +_static int process_iso (uhci_t *s, struct urb *urb, int mode) { int i; int ret = 0; @@ -2589,9 +2589,9 @@ _static int process_urb (uhci_t *s, struct list_head *p) { int ret = 0; - urb_t *urb; + struct urb *urb; - urb=list_entry (p, urb_t, urb_list); + urb=list_entry (p, struct urb, urb_list); //dbg("process_urb: found queued urb: %p", urb); switch (usb_pipetype (urb->pipe)) { @@ -2640,7 +2640,7 @@ #endif if ((usb_pipetype (urb->pipe) != PIPE_INTERRUPT)) { // process_interrupt does completion on its own - urb_t *next_urb = urb->next; + struct urb *next_urb = urb->next; int is_ring = 0; int contains_killed = 0; int loop_count=0; diff -Nru a/drivers/usb/usb-uhci.h b/drivers/usb/usb-uhci.h --- a/drivers/usb/usb-uhci.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usb-uhci.h Fri Jan 18 10:19:43 2002 @@ -158,8 +158,8 @@ dma_addr_t setup_packet_dma; dma_addr_t transfer_buffer_dma; unsigned long started; - urb_t *next_queued_urb; // next queued urb for this EP - urb_t *prev_queued_urb; + struct urb *next_queued_urb; // next queued urb for this EP + struct urb *prev_queued_urb; uhci_desc_t *bottom_qh; uhci_desc_t *next_qh; // next helper QH char use_loop; diff -Nru a/drivers/usb/usb.c b/drivers/usb/usb.c --- a/drivers/usb/usb.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usb.c Fri Jan 18 10:19:43 2002 @@ -1084,12 +1084,13 @@ * * The driver should call usb_free_urb() when it is finished with the urb. */ -urb_t *usb_alloc_urb(int iso_packets) +struct urb *usb_alloc_urb(int iso_packets) { - urb_t *urb; + struct urb *urb; - urb = (urb_t *)kmalloc(sizeof(urb_t) + iso_packets * sizeof(struct usb_iso_packet_descriptor), - in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); + urb = (struct urb *)kmalloc(sizeof(struct urb) + + iso_packets * sizeof(struct usb_iso_packet_descriptor), + in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); if (!urb) { err("alloc_urb: kmalloc failed"); return NULL; @@ -1110,7 +1111,7 @@ * cleaned up with a call to usb_free_urb() when the driver is finished * with it. */ -void usb_free_urb(urb_t* urb) +void usb_free_urb(struct urb *urb) { if (urb) kfree(urb); @@ -1171,7 +1172,7 @@ * the periodic request, and bandwidth reservation is being done for * this controller, submitting such a periodic request will fail. */ -int usb_submit_urb(urb_t *urb) +int usb_submit_urb(struct urb *urb) { if (urb && urb->dev && urb->dev->bus && urb->dev->bus->op) return urb->dev->bus->op->submit_urb(urb); @@ -1205,7 +1206,7 @@ * and the completion function will see status -ECONNRESET. Failure is * indicated by any other return value. */ -int usb_unlink_urb(urb_t *urb) +int usb_unlink_urb(struct urb *urb) { if (urb && urb->dev && urb->dev->bus && urb->dev->bus->op) return urb->dev->bus->op->unlink_urb(urb); @@ -1221,7 +1222,7 @@ int done; }; -static void usb_api_blocking_completion(urb_t *urb) +static void usb_api_blocking_completion(struct urb *urb) { struct usb_api_data *awd = (struct usb_api_data *)urb->context; @@ -1231,7 +1232,7 @@ } // Starts urb and waits for completion or timeout -static int usb_start_wait_urb(urb_t *urb, int timeout, int* actual_length) +static int usb_start_wait_urb(struct urb *urb, int timeout, int* actual_length) { DECLARE_WAITQUEUE(wait, current); struct usb_api_data awd; @@ -1289,7 +1290,7 @@ int usb_internal_control_msg(struct usb_device *usb_dev, unsigned int pipe, struct usb_ctrlrequest *cmd, void *data, int len, int timeout) { - urb_t *urb; + struct urb *urb; int retv; int length; @@ -1376,7 +1377,7 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, void *data, int len, int *actual_length, int timeout) { - urb_t *urb; + struct urb *urb; if (len < 0) return -EINVAL; diff -Nru a/drivers/usb/usbvideo.c b/drivers/usb/usbvideo.c --- a/drivers/usb/usbvideo.c Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usbvideo.c Fri Jan 18 10:19:43 2002 @@ -1776,7 +1776,7 @@ /* * Make all of the blocks of data contiguous */ -static int usbvideo_CompressIsochronous(uvd_t *uvd, urb_t *urb) +static int usbvideo_CompressIsochronous(uvd_t *uvd, struct urb *urb) { char *cdata; int i, totlen = 0; @@ -1891,7 +1891,7 @@ /* We double buffer the Iso lists */ for (i=0; i < USBVIDEO_NUMSBUF; i++) { int j, k; - urb_t *urb = uvd->sbuf[i].urb; + struct urb *urb = uvd->sbuf[i].urb; urb->dev = dev; urb->context = uvd; urb->pipe = usb_rcvisocpipe(dev, uvd->video_endp); diff -Nru a/drivers/usb/usbvideo.h b/drivers/usb/usbvideo.h --- a/drivers/usb/usbvideo.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/usbvideo.h Fri Jan 18 10:19:43 2002 @@ -165,7 +165,7 @@ /* This structure represents one Isoc request - URB and buffer */ typedef struct { char *data; - urb_t *urb; + struct urb *urb; } usbvideo_sbuf_t; typedef struct { diff -Nru a/drivers/usb/vicam.h b/drivers/usb/vicam.h --- a/drivers/usb/vicam.h Fri Jan 18 10:19:43 2002 +++ b/drivers/usb/vicam.h Fri Jan 18 10:19:43 2002 @@ -68,7 +68,7 @@ /* v4l stuff */ char *camera_name; char *fbuf; - urb_t *urb[VICAM_NUMSBUF]; + struct urb *urb[VICAM_NUMSBUF]; int sizes; int *width; int *height; diff -Nru a/include/linux/usb.h b/include/linux/usb.h --- a/include/linux/usb.h Fri Jan 18 10:19:43 2002 +++ b/include/linux/usb.h Fri Jan 18 10:19:43 2002 @@ -743,8 +743,6 @@ struct usb_iso_packet_descriptor iso_frame_desc[0]; /* (in) ISO ONLY */ }; -typedef struct urb urb_t; - /** * usb_fill_control_urb - initializes a control urb * @urb: pointer to the urb to initialize.