diff options
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r-- | drivers/block/floppy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index b58ceae9d0b5..491f21ae83b6 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -632,7 +632,7 @@ static inline void set_debugt(void) { } | |||
632 | static inline void debugt(const char *message) { } | 632 | static inline void debugt(const char *message) { } |
633 | #endif /* DEBUGT */ | 633 | #endif /* DEBUGT */ |
634 | 634 | ||
635 | typedef void (*timeout_fn) (unsigned long); | 635 | typedef void (*timeout_fn)(unsigned long); |
636 | static DEFINE_TIMER(fd_timeout, floppy_shutdown, 0, 0); | 636 | static DEFINE_TIMER(fd_timeout, floppy_shutdown, 0, 0); |
637 | 637 | ||
638 | static const char *timeout_message; | 638 | static const char *timeout_message; |
@@ -1036,7 +1036,7 @@ static void fd_watchdog(void) | |||
1036 | reset_fdc(); | 1036 | reset_fdc(); |
1037 | } else { | 1037 | } else { |
1038 | del_timer(&fd_timer); | 1038 | del_timer(&fd_timer); |
1039 | fd_timer.function = (timeout_fn) fd_watchdog; | 1039 | fd_timer.function = (timeout_fn)fd_watchdog; |
1040 | fd_timer.expires = jiffies + HZ / 10; | 1040 | fd_timer.expires = jiffies + HZ / 10; |
1041 | add_timer(&fd_timer); | 1041 | add_timer(&fd_timer); |
1042 | } | 1042 | } |
@@ -1534,9 +1534,9 @@ static void setup_rw_floppy(void) | |||
1534 | */ | 1534 | */ |
1535 | if (time_after(ready_date, jiffies + DP->select_delay)) { | 1535 | if (time_after(ready_date, jiffies + DP->select_delay)) { |
1536 | ready_date -= DP->select_delay; | 1536 | ready_date -= DP->select_delay; |
1537 | function = (timeout_fn) floppy_start; | 1537 | function = (timeout_fn)floppy_start; |
1538 | } else | 1538 | } else |
1539 | function = (timeout_fn) setup_rw_floppy; | 1539 | function = (timeout_fn)setup_rw_floppy; |
1540 | 1540 | ||
1541 | /* wait until the floppy is spinning fast enough */ | 1541 | /* wait until the floppy is spinning fast enough */ |
1542 | if (fd_wait_for_completion(ready_date, function)) | 1542 | if (fd_wait_for_completion(ready_date, function)) |