Commit 40502149 authored by Tim Schmielau's avatar Tim Schmielau Committed by Jeff Garzik

sb1000 net driver: kill float constant, time_after_eq() jiffies cleanup

parent 6ed7f5b7
...@@ -275,7 +275,7 @@ sb1000_probe(struct net_device *dev) ...@@ -275,7 +275,7 @@ sb1000_probe(struct net_device *dev)
* SB1000 hardware routines to be used during open/configuration phases * SB1000 hardware routines to be used during open/configuration phases
*/ */
const int TimeOutJiffies = (int)(8.75 * HZ); const int TimeOutJiffies = (875 * HZ) / 100;
static inline void nicedelay(unsigned long usecs) static inline void nicedelay(unsigned long usecs)
{ {
...@@ -298,7 +298,7 @@ card_wait_for_busy_clear(const int ioaddr[], const char* name) ...@@ -298,7 +298,7 @@ card_wait_for_busy_clear(const int ioaddr[], const char* name)
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0); schedule_timeout(0);
a = inb(ioaddr[0] + 7); a = inb(ioaddr[0] + 7);
if (jiffies >= timeout) { if (time_after_eq(jiffies, timeout)) {
printk(KERN_WARNING "%s: card_wait_for_busy_clear timeout\n", printk(KERN_WARNING "%s: card_wait_for_busy_clear timeout\n",
name); name);
return -ETIME; return -ETIME;
...@@ -322,7 +322,7 @@ card_wait_for_ready(const int ioaddr[], const char* name, unsigned char in[]) ...@@ -322,7 +322,7 @@ card_wait_for_ready(const int ioaddr[], const char* name, unsigned char in[])
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0); schedule_timeout(0);
a = inb(ioaddr[1] + 6); a = inb(ioaddr[1] + 6);
if (jiffies >= timeout) { if (time_after_eq(jiffies, timeout)) {
printk(KERN_WARNING "%s: card_wait_for_ready timeout\n", printk(KERN_WARNING "%s: card_wait_for_ready timeout\n",
name); name);
return -ETIME; return -ETIME;
...@@ -396,7 +396,7 @@ sb1000_wait_for_ready(const int ioaddr[], const char* name) ...@@ -396,7 +396,7 @@ sb1000_wait_for_ready(const int ioaddr[], const char* name)
timeout = jiffies + Sb1000TimeOutJiffies; timeout = jiffies + Sb1000TimeOutJiffies;
while (inb(ioaddr[1] + 6) & 0x80) { while (inb(ioaddr[1] + 6) & 0x80) {
if (jiffies >= timeout) { if (time_after_eq(jiffies, timeout)) {
printk(KERN_WARNING "%s: sb1000_wait_for_ready timeout\n", printk(KERN_WARNING "%s: sb1000_wait_for_ready timeout\n",
name); name);
return -ETIME; return -ETIME;
......
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