Commit dd4c22a6 authored by Tina Ruchandani's avatar Tina Ruchandani Committed by Mauro Carvalho Chehab

[media] rc-core: Remove 'struct timeval' usage

streamzap uses 'struct timeval' to store the start time of a signal for
gap tracking. struct timeval uses a 32-bit seconds representation which
will overflow in year 2038 and beyond. Replace struct timeval with ktime_t
which uses a 64-bit seconds representation and is 2038 safe. This patch
uses ktime_get_real() preserving the use of wall-clock time in the
original code.
Signed-off-by: default avatarTina Ruchandani <ruchandani.tina@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8c47311d
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ktime.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/input.h> #include <linux/usb/input.h>
#include <media/rc-core.h> #include <media/rc-core.h>
...@@ -96,8 +97,8 @@ struct streamzap_ir { ...@@ -96,8 +97,8 @@ struct streamzap_ir {
/* sum of signal lengths received since signal start */ /* sum of signal lengths received since signal start */
unsigned long sum; unsigned long sum;
/* start time of signal; necessary for gap tracking */ /* start time of signal; necessary for gap tracking */
struct timeval signal_last; ktime_t signal_last;
struct timeval signal_start; ktime_t signal_start;
bool timeout_enabled; bool timeout_enabled;
char name[128]; char name[128];
...@@ -136,20 +137,18 @@ static void sz_push_full_pulse(struct streamzap_ir *sz, ...@@ -136,20 +137,18 @@ static void sz_push_full_pulse(struct streamzap_ir *sz,
DEFINE_IR_RAW_EVENT(rawir); DEFINE_IR_RAW_EVENT(rawir);
if (sz->idle) { if (sz->idle) {
long deltv; int delta;
sz->signal_last = sz->signal_start; sz->signal_last = sz->signal_start;
do_gettimeofday(&sz->signal_start); sz->signal_start = ktime_get_real();
deltv = sz->signal_start.tv_sec - sz->signal_last.tv_sec; delta = ktime_us_delta(sz->signal_start, sz->signal_last);
rawir.pulse = false; rawir.pulse = false;
if (deltv > 15) { if (delta > (15 * USEC_PER_SEC)) {
/* really long time */ /* really long time */
rawir.duration = IR_MAX_DURATION; rawir.duration = IR_MAX_DURATION;
} else { } else {
rawir.duration = (int)(deltv * 1000000 + rawir.duration = delta;
sz->signal_start.tv_usec -
sz->signal_last.tv_usec);
rawir.duration -= sz->sum; rawir.duration -= sz->sum;
rawir.duration = US_TO_NS(rawir.duration); rawir.duration = US_TO_NS(rawir.duration);
rawir.duration = (rawir.duration > IR_MAX_DURATION) ? rawir.duration = (rawir.duration > IR_MAX_DURATION) ?
...@@ -428,7 +427,7 @@ static int streamzap_probe(struct usb_interface *intf, ...@@ -428,7 +427,7 @@ static int streamzap_probe(struct usb_interface *intf,
sz->max_timeout = US_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION); sz->max_timeout = US_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION);
#endif #endif
do_gettimeofday(&sz->signal_start); sz->signal_start = ktime_get_real();
/* Complete final initialisations */ /* Complete final initialisations */
usb_fill_int_urb(sz->urb_in, usbdev, pipe, sz->buf_in, usb_fill_int_urb(sz->urb_in, usbdev, pipe, sz->buf_in,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment