From f11b799282201fbd8c88b51815176a902b1f15b8 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 7 Jan 2008 13:33:45 +0100 Subject: [PATCH] [ALSA] sound: 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/) // @ 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 @ no_include depends on !include && change_compare_np @ @@ #include + #include // Signed-off-by: Julia Lawall Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/drivers/serial-u16550.c | 3 ++- sound/soc/s3c24xx/s3c24xx-i2s.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 3958dbd626b2..f4156011945f 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c @@ -43,6 +43,7 @@ #include #include +#include #include @@ -694,7 +695,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream) (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS || uart->adaptor == SNDRV_SERIAL_GENERIC) && (uart->prev_out != substream->number || - jiffies-lasttime > 3*HZ)) { + time_after(jiffies, lasttime + 3*HZ))) { if (snd_uart16550_buffer_can_write(uart, 3)) { /* Roland Soundcanvas part selection */ diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index fe30e0d82d37..9d8af3a46da8 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -185,7 +186,7 @@ static int s3c24xx_snd_lrsync(void) if (iiscon & S3C2410_IISCON_LRINDEX) break; - if (timeout < jiffies) + if (time_after(jiffies, timeout)) return -ETIMEDOUT; } -- 2.20.1