[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>
This commit is contained in:
parent
1bc9eed379
commit
f11b799282
@ -43,6 +43,7 @@
|
||||
#include <sound/initval.h>
|
||||
|
||||
#include <linux/serial_reg.h>
|
||||
#include <linux/jiffies.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
@ -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 */
|
||||
|
@ -24,6 +24,7 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <sound/driver.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/pcm.h>
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user