diff options
author | Shani <shani.moideen@wipro.com> | 2007-03-28 01:14:31 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:01:03 -0400 |
commit | d7ef45b04905468b08e36b43dbce5b1de496e682 (patch) | |
tree | a693fc57b71541e7244633b4d1b72ad8e2e3e55a | |
parent | acbddb591ba76bb20204fd6a407cb87d3f5f751e (diff) |
Patch:replace with time_after in drivers/net/eexpress.c
Replacing with time_after in drivers/net/eexpress.c
Applies and compiles clean on latest tree.Not tested.
Signed-off-by: Shani Moideen <shani.moideen@wipro.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/eexpress.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 8aaf5ec0c360..2600e2c27a82 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -115,6 +115,7 @@ | |||
115 | #include <linux/mca-legacy.h> | 115 | #include <linux/mca-legacy.h> |
116 | #include <linux/spinlock.h> | 116 | #include <linux/spinlock.h> |
117 | #include <linux/bitops.h> | 117 | #include <linux/bitops.h> |
118 | #include <linux/jiffies.h> | ||
118 | 119 | ||
119 | #include <asm/system.h> | 120 | #include <asm/system.h> |
120 | #include <asm/io.h> | 121 | #include <asm/io.h> |
@@ -556,7 +557,7 @@ static void unstick_cu(struct net_device *dev) | |||
556 | 557 | ||
557 | if (lp->started) | 558 | if (lp->started) |
558 | { | 559 | { |
559 | if ((jiffies - dev->trans_start)>50) | 560 | if (time_after(jiffies, dev->trans_start + 50)) |
560 | { | 561 | { |
561 | if (lp->tx_link==lp->last_tx_restart) | 562 | if (lp->tx_link==lp->last_tx_restart) |
562 | { | 563 | { |
@@ -612,7 +613,7 @@ static void unstick_cu(struct net_device *dev) | |||
612 | } | 613 | } |
613 | else | 614 | else |
614 | { | 615 | { |
615 | if ((jiffies-lp->init_time)>10) | 616 | if (time_after(jiffies, lp->init_time + 10)) |
616 | { | 617 | { |
617 | unsigned short status = scb_status(dev); | 618 | unsigned short status = scb_status(dev); |
618 | printk(KERN_WARNING "%s: i82586 startup timed out, status %04x, resetting...\n", | 619 | printk(KERN_WARNING "%s: i82586 startup timed out, status %04x, resetting...\n", |
@@ -1649,7 +1650,7 @@ eexp_set_multicast(struct net_device *dev) | |||
1649 | #endif | 1650 | #endif |
1650 | oj = jiffies; | 1651 | oj = jiffies; |
1651 | while ((SCB_CUstat(scb_status(dev)) == 2) && | 1652 | while ((SCB_CUstat(scb_status(dev)) == 2) && |
1652 | ((jiffies-oj) < 2000)); | 1653 | (time_after(jiffies, oj + 2000))); |
1653 | if (SCB_CUstat(scb_status(dev)) == 2) | 1654 | if (SCB_CUstat(scb_status(dev)) == 2) |
1654 | printk("%s: warning, CU didn't stop\n", dev->name); | 1655 | printk("%s: warning, CU didn't stop\n", dev->name); |
1655 | lp->started &= ~(STARTED_CU); | 1656 | lp->started &= ~(STARTED_CU); |