patch-2.3.3 linux/arch/m68k/mac/adb-bus.c

• Lines: 30
• Date: Sat May 15 15:05:35 1999
• Orig file: v2.3.2/linux/arch/m68k/mac/adb-bus.c
• Orig date: Mon Oct 5 13:54:39 1998

diff -u --recursive --new-file v2.3.2/linux/arch/m68k/mac/adb-bus.c linux/arch/m68k/mac/adb-bus.c
@@ -2328,12 +2328,12 @@
 	struct adb_request req;
 };
 
-static struct wait_queue *adb_wait;
+static DECLARE_WAIT_QUEUE_HEAD(adb_wait);
 
 static int adb_wait_reply(struct adbdev_state *state, struct file *file)
 {
 	int ret = 0;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait,current);
 
 	add_wait_queue(&adb_wait, &wait);
 	current->state = TASK_INTERRUPTIBLE;
@@ -2552,12 +2552,12 @@
 	struct adb_request req;
 };
 
-static struct wait_queue *adb_wait;
+static DECLARE_WAIT_QUEUE_HEAD(adb_wait);
 
 static int adb_wait_reply(struct adbdev_state *state, struct file *file)
 {
 	int ret = 0;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 
 #if (ADBDEBUG & ADBDEBUG_DEVICE)
 	printk("ADB request: wait_reply (blocking ... \n");