patch-2.4.8 linux/drivers/block/floppy.c
Next file: linux/drivers/block/ida_cmd.h
Previous file: linux/drivers/block/cpqarray.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Sun Aug 5 13:12:40 2001
- Orig file:
v2.4.7/linux/drivers/block/floppy.c
- Orig date:
Fri Feb 9 11:30:22 2001
diff -u --recursive --new-file v2.4.7/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -1034,7 +1034,7 @@
}
/* waits for a delay (spinup or select) to pass */
-static int wait_for_completion(unsigned long delay, timeout_fn function)
+static int fd_wait_for_completion(unsigned long delay, timeout_fn function)
{
if (FDCS->reset){
reset_fdc(); /* do the reset during sleep to win time
@@ -1392,7 +1392,7 @@
* Pause 5 msec to avoid trouble. (Needs to be 2 jiffies)
*/
FDCS->dtr = raw_cmd->rate & 3;
- return(wait_for_completion(jiffies+2UL*HZ/100,
+ return(fd_wait_for_completion(jiffies+2UL*HZ/100,
(timeout_fn) floppy_ready));
} /* fdc_dtr */
@@ -1509,7 +1509,7 @@
function = (timeout_fn) setup_rw_floppy;
/* wait until the floppy is spinning fast enough */
- if (wait_for_completion(ready_date,function))
+ if (fd_wait_for_completion(ready_date,function))
return;
}
dflags = DRS->flags;
@@ -1939,7 +1939,7 @@
set_dor(fdc, mask, data);
/* wait_for_completion also schedules reset if needed. */
- return(wait_for_completion(DRS->select_date+DP->select_delay,
+ return(fd_wait_for_completion(DRS->select_date+DP->select_delay,
(timeout_fn) function));
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)