drivers/net/ne2.c : Use of time_after() macro
Subsystems (2)
PATCH 1/1 drivers/net/ne2.c : Use of time_after() macro
Use of time_after() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read.
Signature · 2 lines
Marcelo Feitoza Parisi marcelo at feitoza.com.br http://marcelo.feitoza.com.br/
drivers/net/ne2.c +4 -3
@@ -75,6 +75,7 @@ static const char *version = "ne2.c:v0.9#include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/io.h>
@@ -408,7 +409,7 @@ static int __init ne2_probe1(struct net_outb (inb (base_addr +NE_RESET ), base_addr +NE_RESET );while ((inb_p (base_addr +EN0_ISR ) &ENISR_RESET ) ==0 ) -if (jiffies - reset_start_time >2 *HZ /100 ) { +if (time_after (jiffies, reset_start_time +2 *HZ /100 )) {printk (" not found (no reset ack).\n" ); retval = -ENODEV ; goto out;
@@ -554,7 +555,7 @@ static void ne_reset_8390(struct net_dev/* This check _should_not_ be necessary, omit eventually. */ while ((inb_p (NE_BASE +EN0_ISR ) &ENISR_RESET ) ==0 ) -if (jiffies - reset_start_time >2 *HZ /100 ) { +if (time_after (jiffies, reset_start_time +2 *HZ /100 )) {printk ("%s: ne_reset_8390() did not complete.\n" , dev->name);break ;
@@ -755,7 +756,7 @@ retry:#endif while ((inb_p (nic_base +EN0_ISR ) &ENISR_RDC ) ==0 ) -if (jiffies - dma_start >2 *HZ /100 ) {/* 20ms */ +if (time_after (jiffies, dma_start +2 *HZ /100 )) {/* 20ms */ printk ("%s: timeout waiting for Tx RDC.\n" , dev->name);ne_reset_8390 (dev);NS8390_init (dev,1 );
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors