]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
media: rc: use ktime accessor functions
authorJasmin Jessich <jasmin@anw.at>
Fri, 25 Aug 2017 09:59:41 +0000 (05:59 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 31 Aug 2017 09:35:18 +0000 (05:35 -0400)
Prefer using accessor functions so we are not dependent on the ktime_t
type.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/rc/rc-ir-raw.c

index f495709e28fbd82ecbdfa9b43fddbf5d70c1dc34..503bc425a187c9faeb45b9ec1c199c7a1e01e42d 100644 (file)
@@ -106,7 +106,7 @@ int ir_raw_event_store_edge(struct rc_dev *dev, bool pulse)
                return -EINVAL;
 
        now = ktime_get();
-       ev.duration = ktime_sub(now, dev->raw->last_event);
+       ev.duration = ktime_to_ns(ktime_sub(now, dev->raw->last_event));
        ev.pulse = !pulse;
 
        rc = ir_raw_event_store(dev, &ev);
@@ -474,18 +474,19 @@ EXPORT_SYMBOL(ir_raw_encode_scancode);
 static void edge_handle(unsigned long arg)
 {
        struct rc_dev *dev = (struct rc_dev *)arg;
-       ktime_t interval = ktime_get() - dev->raw->last_event;
+       ktime_t interval = ktime_sub(ktime_get(), dev->raw->last_event);
 
-       if (interval >= dev->timeout) {
+       if (ktime_to_ns(interval) >= dev->timeout) {
                DEFINE_IR_RAW_EVENT(ev);
 
                ev.timeout = true;
-               ev.duration = interval;
+               ev.duration = ktime_to_ns(interval);
 
                ir_raw_event_store(dev, &ev);
        } else {
                mod_timer(&dev->raw->edge_handle,
-                         jiffies + nsecs_to_jiffies(dev->timeout - interval));
+                         jiffies + nsecs_to_jiffies(dev->timeout -
+                                                    ktime_to_ns(interval)));
        }
 
        ir_raw_event_handle(dev);