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

Next file: linux/drivers/usb/ohci.c
Previous file: linux/drivers/usb/mouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/drivers/usb/ohci-hcd.c linux/drivers/usb/ohci-hcd.c
@@ -63,8 +63,8 @@
-static struct wait_queue *control_wakeup;         
-static struct wait_queue *root_hub = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(control_wakeup);
+static DECLARE_WAIT_QUEUE_HEAD(root_hub);
 static __u8 cc_to_status[16] = { /* mapping of the OHCI CC to the UHCI status codes; first guess */
 /* Activ, Stalled, Data Buffer Err, Babble Detected : NAK recvd, CRC/Timeout, Bitstuff, reservd */
@@ -145,7 +145,7 @@
 static int sohci_control_msg(struct usb_device *usb_dev, unsigned int pipe, void *cmd, void *data, int len)
-	struct wait_queue wait = { current, NULL }; 
+	DECLARE_WAITQUEUE(wait, current);
 	struct ohci * ohci = usb_dev->bus->hcpriv;
 	int status;
 	union ep_addr_ ep_addr;

TCL-scripts by Sam Shen (who was at: