aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-01-07 07:33:45 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:45 -0500
commitf11b799282201fbd8c88b51815176a902b1f15b8 (patch)
tree920484c5838086249f4d5f9a69632823987641cf /sound/drivers
parent1bc9eed379399484d3f5d5a0834674983969bc1e (diff)
[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/) // <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: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/serial-u16550.c3
1 files changed, 2 insertions, 1 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 @@
43#include <sound/initval.h> 43#include <sound/initval.h>
44 44
45#include <linux/serial_reg.h> 45#include <linux/serial_reg.h>
46#include <linux/jiffies.h>
46 47
47#include <asm/io.h> 48#include <asm/io.h>
48 49
@@ -694,7 +695,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)
694 (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS || 695 (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS ||
695 uart->adaptor == SNDRV_SERIAL_GENERIC) && 696 uart->adaptor == SNDRV_SERIAL_GENERIC) &&
696 (uart->prev_out != substream->number || 697 (uart->prev_out != substream->number ||
697 jiffies-lasttime > 3*HZ)) { 698 time_after(jiffies, lasttime + 3*HZ))) {
698 699
699 if (snd_uart16550_buffer_can_write(uart, 3)) { 700 if (snd_uart16550_buffer_can_write(uart, 3)) {
700 /* Roland Soundcanvas part selection */ 701 /* Roland Soundcanvas part selection */