Skip to contentSkip to conversation

atm/fore200e: remove custom msecs_to_jiffies() macro

PATCH New Nishanth Aravamudan 1 participant 1 message Feb 24, 2005

Subsystems (2)
Kernel janitors ATM
lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

PATCH 1/1 atm/fore200e: remove custom msecs_to_jiffies() macro

Hi,

Description: Replace MSECS(), a custom macro, which is incorrect because of the variability of HZ, with msecs_to_jiffies(). Patch is compile-tested.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/atm/fore200e.c +4 -8
@@ -96,10 +96,6 @@
 
 #define FORE200E_NEXT_ENTRY(index, modulo)         (index = ++(index) % (modulo))
 
-
-#define MSECS(ms)  (((ms)*HZ/1000)+1)
-
-
 #if 1
 #define ASSERT(expr)     if (!(expr)) { \
 			     printk(FORE200E "assertion failed! %s[%d]: %s\n", \

@@ -246,7 +242,7 @@ fore200e_chunk_free(struct fore200e* for
 static void
 fore200e_spin(int msecs)
 {
-    unsigned long timeout = jiffies + MSECS(msecs);
+    unsigned long timeout = jiffies + msecs_to_jiffies(msecs);
     while (time_before(jiffies, timeout));
 }
 

@@ -254,7 +250,7 @@ fore200e_spin(int msecs)
 static int
 fore200e_poll(struct fore200e* fore200e, volatile u32* addr, u32 val, int msecs)
 {
-    unsigned long timeout = jiffies + MSECS(msecs);
+    unsigned long timeout = jiffies + msecs_to_jiffies(msecs);
     int           ok;
 
     mb();

@@ -278,7 +274,7 @@ fore200e_poll(struct fore200e* fore200e,
 static int
 fore200e_io_poll(struct fore200e* fore200e, volatile u32 __iomem *addr, u32 val, int msecs)
 {
-    unsigned long timeout = jiffies + MSECS(msecs);
+    unsigned long timeout = jiffies + msecs_to_jiffies(msecs);
     int           ok;
 
     do {

@@ -2596,7 +2592,7 @@ static int __init
 fore200e_monitor_getc(struct fore200e* fore200e)
 {
     struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
-    unsigned long      timeout = jiffies + MSECS(50);
+    unsigned long      timeout = jiffies + msecs_to_jiffies(50);
     int                c;
 
     while (time_before(jiffies, timeout)) {

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors