media: vivid: use time_is_after_jiffies() instead of open coding it

Use the helper function time_is_{before,after}_jiffies() to improve
code readability.

Signed-off-by: Wang Qing <wangqing@vivo.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/test-drivers/vivid/vivid-kthread-cap.c b/drivers/media/test-drivers/vivid/vivid-kthread-cap.c
index 6baa046..690daad 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-kthread-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-kthread-cap.c
@@ -18,6 +18,7 @@
 #include <linux/freezer.h>
 #include <linux/random.h>
 #include <linux/v4l2-dv-timings.h>
+#include <linux/jiffies.h>
 #include <asm/div64.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-dv-timings.h>
@@ -893,7 +894,7 @@ static int vivid_thread_vid_cap(void *data)
                        next_jiffies_since_start = jiffies_since_start;
 
                wait_jiffies = next_jiffies_since_start - jiffies_since_start;
-               while (jiffies - cur_jiffies < wait_jiffies &&
+               while (time_is_after_jiffies(cur_jiffies + wait_jiffies) &&
                       !kthread_should_stop())
                        schedule();
        }

diff --git a/drivers/media/test-drivers/vivid/vivid-kthread-out.c b/drivers/media/test-drivers/vivid/vivid-kthread-out.c
index b6d4316..0833e02 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-kthread-out.c
+++ b/drivers/media/test-drivers/vivid/vivid-kthread-out.c
@@ -18,6 +18,7 @@
 #include <linux/freezer.h>
 #include <linux/random.h>
 #include <linux/v4l2-dv-timings.h>
+#include <linux/jiffies.h>
 #include <asm/div64.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-dv-timings.h>
@@ -234,7 +235,7 @@ static int vivid_thread_vid_out(void *data)
                        next_jiffies_since_start = jiffies_since_start;
 
                wait_jiffies = next_jiffies_since_start - jiffies_since_start;
-               while (jiffies - cur_jiffies < wait_jiffies &&
+               while (time_is_after_jiffies(cur_jiffies + wait_jiffies) &&
                       !kthread_should_stop())
                        schedule();
        }

diff --git a/drivers/media/test-drivers/vivid/vivid-kthread-touch.c b/drivers/media/test-drivers/vivid/vivid-kthread-touch.c
index f065faa..fa711ee 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-kthread-touch.c
+++ b/drivers/media/test-drivers/vivid/vivid-kthread-touch.c
@@ -5,6 +5,7 @@
  */
 
 #include <linux/freezer.h>
+#include <linux/jiffies.h>
 #include "vivid-core.h"
 #include "vivid-kthread-touch.h"
 #include "vivid-touch-cap.h"
@@ -134,7 +135,7 @@ static int vivid_thread_touch_cap(void *data)
                        next_jiffies_since_start = jiffies_since_start;
 
                wait_jiffies = next_jiffies_since_start - jiffies_since_start;
-               while (jiffies - cur_jiffies < wait_jiffies &&
+               while (time_is_after_jiffies(cur_jiffies + wait_jiffies) &&
                       !kthread_should_stop())
                        schedule();
        }

diff --git a/drivers/media/test-drivers/vivid/vivid-sdr-cap.c b/drivers/media/test-drivers/vivid/vivid-sdr-cap.c
index 59fd508..0ae5628 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-sdr-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-sdr-cap.c
@@ -17,6 +17,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-dv-timings.h>
 #include <linux/fixp-arith.h>
+#include <linux/jiffies.h>
 
 #include "vivid-core.h"
 #include "vivid-ctrls.h"
@@ -205,7 +206,7 @@ static int vivid_thread_sdr_cap(void *data)
                        next_jiffies_since_start = jiffies_since_start;
 
                wait_jiffies = next_jiffies_since_start - jiffies_since_start;
-               while (jiffies - cur_jiffies < wait_jiffies &&
+               while (time_is_after_jiffies(cur_jiffies + wait_jiffies) &&
                       !kthread_should_stop())
                        schedule();
        }