From 17515d8990c0f1f85bb01065cdad5137c5d504df Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 11 Jul 2005 01:08:56 -0500 Subject: [PATCH] --- yaml --- r: 5443 b: refs/heads/master c: 6f5eacfc1e9a12ffca10b4abe8e9fddf1997da6f h: refs/heads/master i: 5441: 597468f07bacde76b74faa629c2e118697d9f653 5439: 5634742117c65a4a3b62d02a9f1f8f2a5bf675db v: v3 --- [refs] | 2 +- trunk/drivers/input/joydev.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b0732b32fb19..5b694e9f2030 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6345fdfd190659a2316d18065871245e3a1e0f84 +refs/heads/master: 6f5eacfc1e9a12ffca10b4abe8e9fddf1997da6f diff --git a/trunk/drivers/input/joydev.c b/trunk/drivers/input/joydev.c index ff8e1bbd0e13..e0938d1d3ad7 100644 --- a/trunk/drivers/input/joydev.c +++ b/trunk/drivers/input/joydev.c @@ -37,8 +37,6 @@ MODULE_LICENSE("GPL"); #define JOYDEV_MINORS 16 #define JOYDEV_BUFFER_SIZE 64 -#define MSECS(t) (1000 * ((t) / HZ) + 1000 * ((t) % HZ) / HZ) - struct joydev { int exist; int open; @@ -117,7 +115,7 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne return; } - event.time = MSECS(jiffies); + event.time = jiffies_to_msecs(jiffies); list_for_each_entry(list, &joydev->list, node) { @@ -245,7 +243,7 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo struct js_event event; - event.time = MSECS(jiffies); + event.time = jiffies_to_msecs(jiffies); if (list->startup < joydev->nkey) { event.type = JS_EVENT_BUTTON | JS_EVENT_INIT;