From: Paul Fulghum Uses msecs_to_jiffies() instead of the custom jiffies_from_ms(). Signed-off-by: Nishanth Aravamudan Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/pcmcia/synclink_cs.c | 7 +++---- 25-akpm/drivers/char/synclinkmp.c | 12 +++++------- 2 files changed, 8 insertions(+), 11 deletions(-) diff -puN drivers/char/pcmcia/synclink_cs.c~synclinkc-kernel-janitor-changes drivers/char/pcmcia/synclink_cs.c --- 25/drivers/char/pcmcia/synclink_cs.c~synclinkc-kernel-janitor-changes 2004-09-05 14:48:35.595162856 -0700 +++ 25-akpm/drivers/char/pcmcia/synclink_cs.c 2004-09-05 14:48:35.614159968 -0700 @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -443,8 +444,6 @@ static int tx_abort(MGSLPC_INFO *info); static int set_rxenable(MGSLPC_INFO *info, int enable); static int wait_events(MGSLPC_INFO *info, int __user *mask); -#define jiffies_from_ms(a) ((((a) * HZ)/1000)+1) - static MGSLPC_INFO *mgslpc_device_list = NULL; static int mgslpc_device_count = 0; @@ -3650,7 +3649,7 @@ void tx_start(MGSLPC_INFO *info) } else { info->tx_active = 1; tx_ready(info); - info->tx_timer.expires = jiffies + jiffies_from_ms(5000); + info->tx_timer.expires = jiffies + msecs_to_jiffies(5000); add_timer(&info->tx_timer); } } @@ -4110,7 +4109,7 @@ BOOLEAN irq_test(MGSLPC_INFO *info) end_time=100; while(end_time-- && !info->irq_occurred) { set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(jiffies_from_ms(10)); + schedule_timeout(msecs_to_jiffies(10)); } info->testing_irq = FALSE; diff -puN drivers/char/synclinkmp.c~synclinkc-kernel-janitor-changes drivers/char/synclinkmp.c --- 25/drivers/char/synclinkmp.c~synclinkc-kernel-janitor-changes 2004-09-05 14:48:35.598162400 -0700 +++ 25-akpm/drivers/char/synclinkmp.c 2004-09-05 14:48:35.626158144 -0700 @@ -453,8 +453,6 @@ typedef struct _synclinkmp_info { #define CRCE BIT2 -#define jiffies_from_ms(a) ((((a) * HZ)/1000)+1) - /* * Global linked list of SyncLink devices */ @@ -2759,7 +2757,7 @@ static int startup(SLMP_INFO * info) change_params(info); - info->status_timer.expires = jiffies + jiffies_from_ms(10); + info->status_timer.expires = jiffies + msecs_to_jiffies(10); add_timer(&info->status_timer); if (info->tty) @@ -4317,7 +4315,7 @@ void tx_start(SLMP_INFO *info) write_reg(info, TXDMA + DIR, 0x40); /* enable Tx DMA interrupts (EOM) */ write_reg(info, TXDMA + DSR, 0xf2); /* clear Tx DMA IRQs, enable Tx DMA */ - info->tx_timer.expires = jiffies + jiffies_from_ms(5000); + info->tx_timer.expires = jiffies + msecs_to_jiffies(5000); add_timer(&info->tx_timer); } else { @@ -5205,7 +5203,7 @@ int irq_test(SLMP_INFO *info) timeout=100; while( timeout-- && !info->irq_occurred ) { set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(jiffies_from_ms(10)); + schedule_timeout(msecs_to_jiffies(10)); } spin_lock_irqsave(&info->lock,flags); @@ -5356,7 +5354,7 @@ int loopback_test(SLMP_INFO *info) /* Set a timeout for waiting for interrupt. */ for ( timeout = 100; timeout; --timeout ) { set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(jiffies_from_ms(10)); + schedule_timeout(msecs_to_jiffies(10)); if (rx_get_frame(info)) { rc = TRUE; @@ -5612,7 +5610,7 @@ void status_timeout(unsigned long contex info->status_timer.data = (unsigned long)info; info->status_timer.function = status_timeout; - info->status_timer.expires = jiffies + jiffies_from_ms(10); + info->status_timer.expires = jiffies + msecs_to_jiffies(10); add_timer(&info->status_timer); } _