lkml.org 
[lkml]   [2003]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Amiflop mod_timer()
Amiga floppy driver: Convert {del,add}_timer() sequences to mod_timer().

--- linux-2.4.x/drivers/block/amiflop.c Fri Nov 8 18:43:37 2002
+++ linux-m68k-2.4.x/drivers/block/amiflop.c Sun Mar 16 12:25:58 2003
@@ -366,10 +366,8 @@
unit[nr].motor = 1;
fd_select(nr);

- del_timer(&motor_on_timer);
motor_on_timer.data = nr;
- motor_on_timer.expires = jiffies + HZ/2;
- add_timer(&motor_on_timer);
+ mod_timer(&motor_on_timer, jiffies + HZ/2);

on_attempts = 10;
sleep_on (&motor_wait);
@@ -427,11 +425,9 @@
int drive;

drive = nr & 3;
- del_timer(motor_off_timer + drive);
- motor_off_timer[drive].expires = jiffies + 3*HZ;
/* called this way it is always from interrupt */
motor_off_timer[drive].data = nr | 0x80000000;
- add_timer(motor_off_timer + drive);
+ mod_timer(motor_off_timer + drive, jiffies + 3*HZ);
}

static int fd_calibrate(int drive)
@@ -1466,10 +1462,7 @@

unit[drive].dirty = 1;
/* reset the timer */
- del_timer (flush_track_timer + drive);
-
- flush_track_timer[drive].expires = jiffies + 1;
- add_timer (flush_track_timer + drive);
+ mod_timer(flush_track_timer + drive, jiffies + 1);
restore_flags (flags);
break;
}
Gr{oetje,eeting}s,
Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:34    [W:0.023 / U:0.604 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site