patch-2.3.32 linux/drivers/block/swim_iop.c

• Lines: 27
• Date: Sun Dec 12 23:02:23 1999
• Orig file: v2.3.31/linux/drivers/block/swim_iop.c
• Orig date: Tue Sep 7 12:14:06 1999

diff -u --recursive --new-file v2.3.31/linux/drivers/block/swim_iop.c linux/drivers/block/swim_iop.c
@@ -121,7 +121,7 @@
 static void set_timeout(struct floppy_state *fs, int nticks,
 			void (*proc)(unsigned long));
 static void fd_request_timeout(unsigned long);
-static void do_fd_request(void);
+static void do_fd_request(request_queue_t * q);
 static void start_request(struct floppy_state *fs);
 
 static struct file_operations floppy_fops = {
@@ -163,7 +163,7 @@
 		       MAJOR_NR);
 		return -EBUSY;
 	}
-	blk_dev[MAJOR_NR].request_fn = DEVICE_REQUEST;
+	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST);
 	blksize_size[MAJOR_NR] = floppy_blocksizes;
 	blk_size[MAJOR_NR] = floppy_sizes;
 
@@ -566,7 +566,7 @@
 	restore_flags(flags);
 }
 
-static void do_fd_request(void)
+static void do_fd_request(request_queue_t * q)
 {
 	int i;