patch-2.3.1 linux/drivers/usb/ohci.c

• Lines: 27
• Date: Tue May 11 23:17:31 1999
• Orig file: v2.3.0/linux/drivers/usb/ohci.c
• Orig date: Tue May 11 10:27:04 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/usb/ohci.c linux/drivers/usb/ohci.c
@@ -57,7 +57,7 @@
 static int apm_resume = 0;
 #endif
 
-static struct wait_queue *ohci_configure = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(ohci_configure);
 
 #ifdef OHCI_TIMER
 static struct timer_list ohci_timer;	/* timer for root hub polling */
@@ -476,7 +476,7 @@
 /*
  * Control thread operations:
  */
-static struct wait_queue *control_wakeup;
+static DECLARE_WAIT_QUEUE_HEAD(control_wakeup);
 
 /*
  *  This is the handler that gets called when a control transaction
@@ -515,7 +515,7 @@
 	 */
 	struct ohci_ed *control_ed = &dev->ohci->root_hub->ed[ED_CONTROL];
 	struct ohci_td *setup_td, *data_td, *status_td;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 
 #if 0
 	printk(KERN_DEBUG "entering ohci_control_msg %p (ohci_dev: %p) pipe 0x%x, cmd %p, data %p, len %d\n", usb, dev, pipe, cmd, data, len);