forked from luck/tmp_suning_uos_patched
serial: use time_before, time_before_eq, etc
The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. A simplified version of the semantic patch making this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @ change_compare_np @ expression E; @@ ( - jiffies <= E + time_before_eq(jiffies,E) | - jiffies >= E + time_after_eq(jiffies,E) | - jiffies < E + time_before(jiffies,E) | - jiffies > E + time_after(jiffies,E) ) @ include depends on change_compare_np @ @@ #include <linux/jiffies.h> @ no_include depends on !include && change_compare_np @ @@ #include <linux/...> + #include <linux/jiffies.h> // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
01c194d927
commit
d1ec61e668
|
@ -51,6 +51,7 @@ extern int kgdb_output_string (const char* s, unsigned int count);
|
|||
|
||||
/* #ifdef CONFIG_SERIAL_CONSOLE */ /* This seems to be a post 2.0 thing - mles */
|
||||
#include <linux/console.h>
|
||||
#include <linux/jiffies.h>
|
||||
|
||||
/* this defines the index into rs_table for the port to use
|
||||
*/
|
||||
|
@ -1729,7 +1730,7 @@ static void rs_360_wait_until_sent(struct tty_struct *tty, int timeout)
|
|||
msleep_interruptible(jiffies_to_msecs(char_time));
|
||||
if (signal_pending(current))
|
||||
break;
|
||||
if (timeout && ((orig_jiffies + timeout) < jiffies))
|
||||
if (timeout && (time_after(jiffies, orig_jiffies + timeout)))
|
||||
break;
|
||||
/* The 'tx_cur' is really the next buffer to send. We
|
||||
* have to back up to the previous BD and wait for it
|
||||
|
|
Loading…
Reference in New Issue
Block a user