Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f11b7992 authored by Julia Lawall's avatar Julia Lawall Committed by Jaroslav Kysela
Browse files

[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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 1bc9eed3

sound/drivers/serial-u16550.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <sound/initval.h>

#include <sound/initval.h>





#include <linux/serial_reg.h>

#include <linux/serial_reg.h>

#include <linux/jiffies.h>





#include <asm/io.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_SOUNDCANVAS ||

			     uart->adaptor == SNDRV_SERIAL_GENERIC) &&

			     uart->adaptor == SNDRV_SERIAL_GENERIC) &&

			    (uart->prev_out != substream->number ||

			    (uart->prev_out != substream->number ||

			     jiffies-lasttime > 3*HZ)) {

			     time_after(jiffies, lasttime + 3*HZ))) {





				if (snd_uart16550_buffer_can_write(uart, 3)) {

				if (snd_uart16550_buffer_can_write(uart, 3)) {

					/* Roland Soundcanvas part selection */

					/* Roland Soundcanvas part selection */

sound/soc/s3c24xx/s3c24xx-i2s.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/device.h>

#include <linux/device.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/jiffies.h>

#include <sound/driver.h>

#include <sound/driver.h>

#include <sound/core.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm.h>
@@ -185,7 +186,7 @@ static int s3c24xx_snd_lrsync(void) 
		if (iiscon & S3C2410_IISCON_LRINDEX)

		if (iiscon & S3C2410_IISCON_LRINDEX)

			break;

			break;





		if (timeout < jiffies)

		if (time_after(jiffies, timeout))

			return -ETIMEDOUT;

			return -ETIMEDOUT;

	}

	}