git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
acorn
/
block
/
fd1772.c
diff --git
a/drivers/acorn/block/fd1772.c
b/drivers/acorn/block/fd1772.c
index
3cd2e96
..
0485423
100644
(file)
--- a/
drivers/acorn/block/fd1772.c
+++ b/
drivers/acorn/block/fd1772.c
@@
-376,19
+376,15
@@
static void do_fd_request(request_queue_t *);
/************************* End of Prototypes **************************/
/************************* End of Prototypes **************************/
-static struct timer_list motor_off_timer =
- TIMER_INITIALIZER(fd_motor_off_timer, 0, 0);
+static DEFINE_TIMER(motor_off_timer, fd_motor_off_timer, 0, 0);
#ifdef TRACKBUFFER
#ifdef TRACKBUFFER
-static struct timer_list readtrack_timer =
- TIMER_INITIALIZER(fd_readtrack_check, 0, 0);
+static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0);
#endif
#endif
-static struct timer_list timeout_timer =
- TIMER_INITIALIZER(fd_times_out, 0, 0);
+static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0);
-static struct timer_list fd_timer =
- TIMER_INITIALIZER(check_change, 0, 0);
+static DEFINE_TIMER(fd_timer, check_change, 0, 0);
/* DAG: Haven't got a clue what this is? */
int stdma_islocked(void)
/* DAG: Haven't got a clue what this is? */
int stdma_islocked(void)
@@
-1283,8
+1279,7
@@
static void do_fd_request(request_queue_t* q)
if (fdc_busy) return;
save_flags(flags);
cli();
if (fdc_busy) return;
save_flags(flags);
cli();
- while (fdc_busy)
- sleep_on(&fdc_wait);
+ wait_event(fdc_wait, !fdc_busy);
fdc_busy = 1;
ENABLE_IRQ();
restore_flags(flags);
fdc_busy = 1;
ENABLE_IRQ();
restore_flags(flags);