]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
media: vidtv: simplify PCR logic to get jiffies
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sun, 20 Sep 2020 06:22:20 +0000 (08:22 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 1 Oct 2020 07:19:48 +0000 (09:19 +0200)
There's no need to have a check when setting timing.past_jiffies,
as we can simply do the initialization earlier at vidtv_mux_init().

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/test-drivers/vidtv/vidtv_mux.c

index 43b13aa3a8bc81b209c9dc1fb5cf1240d1182489..6a3123c51cc453afa33d9b83fb6374b0ad8e56f9 100644 (file)
@@ -100,11 +100,7 @@ static void vidtv_mux_update_clk(struct vidtv_mux *m)
        /* call this at every thread iteration */
        u64 elapsed_time;
 
-       /* this will not hold a value yet if we have just started */
-       m->timing.past_jiffies = m->timing.current_jiffies ?
-                                m->timing.current_jiffies :
-                                get_jiffies_64();
-
+       m->timing.past_jiffies = m->timing.current_jiffies;
        m->timing.current_jiffies = get_jiffies_64();
 
        elapsed_time = jiffies_to_usecs(m->timing.current_jiffies -
@@ -449,6 +445,7 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe,
        m->pcr_pid = args.pcr_pid;
        m->transport_stream_id = args.transport_stream_id;
        m->priv = args.priv;
+       m->timing.current_jiffies = get_jiffies_64();
 
        if (args.channels)
                m->channels = args.channels;