Commit 85f54536 authored by Chas Williams's avatar Chas Williams Committed by David S. Miller

[ATM]: fore200e: Replace MSECS() with msecs_to_jiffies()

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f9dab44
...@@ -96,10 +96,6 @@ ...@@ -96,10 +96,6 @@
#define FORE200E_NEXT_ENTRY(index, modulo) (index = ++(index) % (modulo)) #define FORE200E_NEXT_ENTRY(index, modulo) (index = ++(index) % (modulo))
#define MSECS(ms) (((ms)*HZ/1000)+1)
#if 1 #if 1
#define ASSERT(expr) if (!(expr)) { \ #define ASSERT(expr) if (!(expr)) { \
printk(FORE200E "assertion failed! %s[%d]: %s\n", \ printk(FORE200E "assertion failed! %s[%d]: %s\n", \
...@@ -246,7 +242,7 @@ fore200e_chunk_free(struct fore200e* fore200e, struct chunk* chunk) ...@@ -246,7 +242,7 @@ fore200e_chunk_free(struct fore200e* fore200e, struct chunk* chunk)
static void static void
fore200e_spin(int msecs) fore200e_spin(int msecs)
{ {
unsigned long timeout = jiffies + MSECS(msecs); unsigned long timeout = jiffies + msecs_to_jiffies(msecs);
while (time_before(jiffies, timeout)); while (time_before(jiffies, timeout));
} }
...@@ -254,7 +250,7 @@ fore200e_spin(int msecs) ...@@ -254,7 +250,7 @@ fore200e_spin(int msecs)
static int static int
fore200e_poll(struct fore200e* fore200e, volatile u32* addr, u32 val, int msecs) 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; int ok;
mb(); mb();
...@@ -278,7 +274,7 @@ fore200e_poll(struct fore200e* fore200e, volatile u32* addr, u32 val, int msecs) ...@@ -278,7 +274,7 @@ fore200e_poll(struct fore200e* fore200e, volatile u32* addr, u32 val, int msecs)
static int static int
fore200e_io_poll(struct fore200e* fore200e, volatile u32 __iomem *addr, u32 val, int msecs) 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; int ok;
do { do {
...@@ -2563,7 +2559,7 @@ static int __init ...@@ -2563,7 +2559,7 @@ static int __init
fore200e_monitor_getc(struct fore200e* fore200e) fore200e_monitor_getc(struct fore200e* fore200e)
{ {
struct cp_monitor __iomem * monitor = fore200e->cp_monitor; struct cp_monitor __iomem * monitor = fore200e->cp_monitor;
unsigned long timeout = jiffies + MSECS(50); unsigned long timeout = jiffies + msecs_to_jiffies(50);
int c; int c;
while (time_before(jiffies, timeout)) { while (time_before(jiffies, timeout)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment