diff options
Diffstat (limited to 'drivers/cdrom/mcd.h')
| -rw-r--r-- | drivers/cdrom/mcd.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/cdrom/mcd.h b/drivers/cdrom/mcd.h index fffaa92a6..ce903d2f2 100644 --- a/drivers/cdrom/mcd.h +++ b/drivers/cdrom/mcd.h @@ -73,12 +73,13 @@ #define READ_DATA(port, buf, nr) \ insb(port, buf, nr) -#define SET_TIMER(func, jifs) \ - ((timer_table[MCD_TIMER].expires = jiffies + jifs), \ - (timer_table[MCD_TIMER].fn = func), \ - (timer_active |= 1<<MCD_TIMER)) +#define SET_TIMER(func, jifs) \ + do { \ + mcd_timer.function = func; \ + mod_timer(&mcd_timer, jiffies + jifs); \ + } while (0) -#define CLEAR_TIMER timer_active &= ~(1<<MCD_TIMER) +#define CLEAR_TIMER del_timer_async(&mcd_timer); #define MAX_TRACKS 104 |