Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Use time_before in hamradio drivers

Use of time_before() macro, defined at linux/jiffies.h, which deal with
wrapping correctly and are nicer to read.

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>

baycom_epp.c | 3 ++-
baycom_par.c | 3 ++-
baycom_ser_fdx.c | 3 ++-
baycom_ser_hdx.c | 3 ++-
mkiss.c | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

authored by

Marcelo Feitoza Parisi and committed by
Jeff Garzik
cd8749b4 6b9b97ce

+10 -5
+2 -1
drivers/net/hamradio/baycom_epp.c
··· 54 54 #include <linux/kmod.h> 55 55 #include <linux/hdlcdrv.h> 56 56 #include <linux/baycom.h> 57 + #include <linux/jiffies.h> 57 58 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) 58 59 /* prototypes for ax25_encapsulate and ax25_rebuild_header */ 59 60 #include <net/ax25.h> ··· 288 287 * measure the interrupt frequency 289 288 */ 290 289 bc->debug_vals.cur_intcnt++; 291 - if ((cur_jiffies - bc->debug_vals.last_jiffies) >= HZ) { 290 + if (time_after_eq(cur_jiffies, bc->debug_vals.last_jiffies + HZ)) { 292 291 bc->debug_vals.last_jiffies = cur_jiffies; 293 292 bc->debug_vals.last_intcnt = bc->debug_vals.cur_intcnt; 294 293 bc->debug_vals.cur_intcnt = 0;
+2 -1
drivers/net/hamradio/baycom_par.c
··· 84 84 #include <linux/baycom.h> 85 85 #include <linux/parport.h> 86 86 #include <linux/bitops.h> 87 + #include <linux/jiffies.h> 87 88 88 89 #include <asm/bug.h> 89 90 #include <asm/system.h> ··· 166 165 * measure the interrupt frequency 167 166 */ 168 167 bc->debug_vals.cur_intcnt++; 169 - if ((cur_jiffies - bc->debug_vals.last_jiffies) >= HZ) { 168 + if (time_after_eq(cur_jiffies, bc->debug_vals.last_jiffies + HZ)) { 170 169 bc->debug_vals.last_jiffies = cur_jiffies; 171 170 bc->debug_vals.last_intcnt = bc->debug_vals.cur_intcnt; 172 171 bc->debug_vals.cur_intcnt = 0;
+2 -1
drivers/net/hamradio/baycom_ser_fdx.c
··· 79 79 #include <asm/io.h> 80 80 #include <linux/hdlcdrv.h> 81 81 #include <linux/baycom.h> 82 + #include <linux/jiffies.h> 82 83 83 84 /* --------------------------------------------------------------------- */ 84 85 ··· 160 159 * measure the interrupt frequency 161 160 */ 162 161 bc->debug_vals.cur_intcnt++; 163 - if ((cur_jiffies - bc->debug_vals.last_jiffies) >= HZ) { 162 + if (time_after_eq(cur_jiffies, bc->debug_vals.last_jiffies + HZ)) { 164 163 bc->debug_vals.last_jiffies = cur_jiffies; 165 164 bc->debug_vals.last_intcnt = bc->debug_vals.cur_intcnt; 166 165 bc->debug_vals.cur_intcnt = 0;
+2 -1
drivers/net/hamradio/baycom_ser_hdx.c
··· 69 69 #include <asm/io.h> 70 70 #include <linux/hdlcdrv.h> 71 71 #include <linux/baycom.h> 72 + #include <linux/jiffies.h> 72 73 73 74 /* --------------------------------------------------------------------- */ 74 75 ··· 151 150 * measure the interrupt frequency 152 151 */ 153 152 bc->debug_vals.cur_intcnt++; 154 - if ((cur_jiffies - bc->debug_vals.last_jiffies) >= HZ) { 153 + if (time_after_eq(cur_jiffies, bc->debug_vals.last_jiffies + HZ)) { 155 154 bc->debug_vals.last_jiffies = cur_jiffies; 156 155 bc->debug_vals.last_intcnt = bc->debug_vals.cur_intcnt; 157 156 bc->debug_vals.cur_intcnt = 0;
+2 -1
drivers/net/hamradio/mkiss.c
··· 46 46 #include <linux/etherdevice.h> 47 47 #include <linux/skbuff.h> 48 48 #include <linux/if_arp.h> 49 + #include <linux/jiffies.h> 49 50 50 51 #include <net/ax25.h> 51 52 ··· 430 429 * May be we must check transmitter timeout here ? 431 430 * 14 Oct 1994 Dmitry Gorodchanin. 432 431 */ 433 - if (jiffies - dev->trans_start < 20 * HZ) { 432 + if (time_before(jiffies, dev->trans_start + 20 * HZ)) { 434 433 /* 20 sec timeout not reached */ 435 434 return 1; 436 435 }