openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: android: Replace timeval with ktime_t in timed_gpio.c 

'struct timeval t' is used to return remaining time in milliseconds.

32-bit systems using 'struct timeval' will break in the year 2038,
so we have to replace that code with more appropriate types.
This patch changes the android driver to use ktime_t.

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Somya Anand 2014-10-23 21:28:38 +02:00 committed by Greg Kroah-Hartman
parent dd28153b2a
commit d2b778712e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/android/timed_gpio.c
View File

@ -20,6 +20,7 @@
#include <linux/hrtimer.h> #include <linux/hrtimer.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/ktime.h>
#include "timed_output.h" #include "timed_output.h"
#include "timed_gpio.h" #include "timed_gpio.h"
@ -46,16 +47,16 @@ static enum hrtimer_restart gpio_timer_func(struct hrtimer *timer)
static int gpio_get_time(struct timed_output_dev *dev) static int gpio_get_time(struct timed_output_dev *dev)
{ {
struct timed_gpio_data *data; struct timed_gpio_data *data;
struct timeval t; ktime_t t;
data = container_of(dev, struct timed_gpio_data, dev); data = container_of(dev, struct timed_gpio_data, dev);
if (!hrtimer_active(&data->timer)) if (!hrtimer_active(&data->timer))
return 0; return 0;
t = ktime_to_timeval(hrtimer_get_remaining(&data->timer)); t = hrtimer_get_remaining(&data->timer);
return t.tv_sec * 1000 + t.tv_usec / 1000; return ktime_to_ms(t);
} }
static void gpio_enable(struct timed_output_dev *dev, int value) static void gpio_enable(struct timed_output_dev *dev, int value)