From: Julia Lawall <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> --- diff -r -u -p a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c --- a/drivers/usb/serial/io_ti.c 2007-07-23 11:27:17.000000000 +0200 +++ b/drivers/usb/serial/io_ti.c 2007-12-23 20:30:39.000000000 +0100 @@ -639,7 +639,7 @@ static void TIChasePort(struct edgeport_ /* wait for data to drain from the device */ timeout += jiffies; - while ((long)(jiffies - timeout) < 0 && !signal_pending(current) + while (time_before(jiffies, timeout) && !signal_pending(current) && usb_get_intfdata(port->port->serial->interface)) { /* not disconnected */ if (!TIIsTxActive(port)) break; diff -r -u -p a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c --- a/drivers/usb/serial/ti_usb_3410_5052.c 2007-10-22 11:25:25.000000000 +0200 +++ b/drivers/usb/serial/ti_usb_3410_5052.c 2007-12-23 20:30:39.000000000 +0100 @@ -84,6 +84,7 @@ #include <asm/semaphore.h> #include <linux/usb.h> #include <linux/usb/serial.h> +#include <linux/jiffies.h> #include "ti_usb_3410_5052.h" #include "ti_fw_3410.h" /* firmware image for 3410 */ @@ -1531,7 +1532,7 @@ static void ti_drain(struct ti_port *tpo /* wait for empty tx register, plus 20 ms */ timeout += jiffies; tport->tp_lsr &= ~TI_LSR_TX_EMPTY; - while ((long)(jiffies - timeout) < 0 && !signal_pending(current) + while (time_before(jiffies, timeout) && !signal_pending(current) && !(tport->tp_lsr&TI_LSR_TX_EMPTY) && !tdev->td_urb_error && usb_get_intfdata(port->serial->interface)) { /* not disconnected */ if (ti_get_lsr(tport)) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
