drivers/net/eth16i.c : Use of the time_after() macro
Subsystems (2)
PATCH 1/1 drivers/net/eth16i.c : Use of the time_after() macro
Use of the time_after() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read.
Signed-off-by Marcelo Feitoza Parisi <[email protected]>
drivers/net/eth16i.c +7 -5
@@ -161,6 +161,7 @@#include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/io.h>
@@ -754,7 +755,7 @@static int eth16i_send_probe_packet (int ioaddr,unsigned char *b,int l) { -int starttime; +unsigned long starttime;outb (0xff , ioaddr +TX_STATUS_REG );
@@ -765,7 +766,7 @@outb (TX_START |1 , ioaddr +TRANSMIT_START_REG );while ( (inb (ioaddr +TX_STATUS_REG ) &0x80 ) ==0 ) { -if ( (jiffies - starttime) >TX_TIMEOUT ) { +if ((time_after (jiffies, starttime +TX_TIMEOUT ))) {return -1 ; } }
@@ -775,18 +776,19 @@static int eth16i_receive_probe_packet (int ioaddr) { -int starttime; +unsigned long starttime; starttime = jiffies;while ((inb (ioaddr +TX_STATUS_REG ) &0x20 ) ==0 ) { -if ( (jiffies - starttime) >TX_TIMEOUT ) { +if (time_after (jiffies, starttime +TX_TIMEOUT )) {if (eth16i_debug >1 )printk (KERN_DEBUG "Timeout occurred waiting transmit packet received\n" ); starttime = jiffies;while ((inb (ioaddr +RX_STATUS_REG ) &0x80 ) ==0 ) { -if ( (jiffies - starttime) >TX_TIMEOUT ) { +if (time_after (jiffies, + starttime +TX_TIMEOUT )) {if (eth16i_debug >1 )printk (KERN_DEBUG "Timeout occurred waiting receive packet\n" );return -1 ;
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors