diff options
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r-- | drivers/input/joydev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index ff8e1bbd0e13..e0938d1d3ad7 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
@@ -37,8 +37,6 @@ MODULE_LICENSE("GPL"); | |||
37 | #define JOYDEV_MINORS 16 | 37 | #define JOYDEV_MINORS 16 |
38 | #define JOYDEV_BUFFER_SIZE 64 | 38 | #define JOYDEV_BUFFER_SIZE 64 |
39 | 39 | ||
40 | #define MSECS(t) (1000 * ((t) / HZ) + 1000 * ((t) % HZ) / HZ) | ||
41 | |||
42 | struct joydev { | 40 | struct joydev { |
43 | int exist; | 41 | int exist; |
44 | int open; | 42 | int open; |
@@ -117,7 +115,7 @@ static void joydev_event(struct input_handle *handle, unsigned int type, unsigne | |||
117 | return; | 115 | return; |
118 | } | 116 | } |
119 | 117 | ||
120 | event.time = MSECS(jiffies); | 118 | event.time = jiffies_to_msecs(jiffies); |
121 | 119 | ||
122 | list_for_each_entry(list, &joydev->list, node) { | 120 | list_for_each_entry(list, &joydev->list, node) { |
123 | 121 | ||
@@ -245,7 +243,7 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo | |||
245 | 243 | ||
246 | struct js_event event; | 244 | struct js_event event; |
247 | 245 | ||
248 | event.time = MSECS(jiffies); | 246 | event.time = jiffies_to_msecs(jiffies); |
249 | 247 | ||
250 | if (list->startup < joydev->nkey) { | 248 | if (list->startup < joydev->nkey) { |
251 | event.type = JS_EVENT_BUTTON | JS_EVENT_INIT; | 249 | event.type = JS_EVENT_BUTTON | JS_EVENT_INIT; |