patch-2.3.1 linux/drivers/block/amiflop.c

• Lines: 30
• Date: Tue May 11 23:33:42 1999
• Orig file: v2.3.0/linux/drivers/block/amiflop.c
• Orig date: Sun Nov 15 11:23:08 1998

diff -u --recursive --new-file v2.3.0/linux/drivers/block/amiflop.c linux/drivers/block/amiflop.c
@@ -167,9 +167,9 @@
 /* request loop (trackbuffer) */
 static volatile int fdc_busy = -1;
 static volatile int fdc_nested = 0;
-static struct wait_queue *fdc_wait = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
  
-static struct wait_queue *motor_wait = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(motor_wait);
 
 static volatile int selected = -1;	/* currently selected drive */
 
@@ -185,7 +185,7 @@
  * request.
  */
 static volatile char block_flag = 0;
-static struct wait_queue *wait_fd_block = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(wait_fd_block);
 
 /* MS-Dos MFM Coding tables (should go quick and easy) */
 static unsigned char mfmencode[16]={
@@ -196,7 +196,7 @@
 
 /* floppy internal millisecond timer stuff */
 static volatile int ms_busy = -1;
-static struct wait_queue *ms_wait = NULL;
+static DECLARE_WAIT_QUEUE_HEAD(ms_wait);
 #define MS_TICKS ((amiga_eclock+50)/1000)
 
 /*