Hi,
Trivial {del,add}_timer to mod_timer conversions.
vinay
--- linux-2.5.68/drivers/block/floppy.c 2003-04-21 10:14:23.000000000 +0530
+++ linux-2.5.68-nvk/drivers/block/floppy.c 2003-05-03 15:37:14.000000000 +0530
@@ -667,15 +667,16 @@
static void reschedule_timeout(int drive, const char *message, int marg)
{
+ long delay;
+
if (drive == current_reqD)
drive = current_drive;
- del_timer(&fd_timeout);
if (drive < 0 || drive > N_DRIVE) {
- fd_timeout.expires = jiffies + 20UL*HZ;
+ delay = jiffies + 20UL*HZ;
drive=0;
} else
- fd_timeout.expires = jiffies + UDP->timeout;
- add_timer(&fd_timeout);
+ delay = jiffies + UDP->timeout;
+ mod_timer(&fd_timeout, delay);
if (UDP->flags & FD_DEBUG){
DPRINT("reschedule timeout ");
printk(message, marg);