Skip to content

Commit

Permalink
Input: joydev - remove custom conversion from jiffies to msecs
Browse files Browse the repository at this point in the history
Replace the MSECS() macro with the jiffies_to_msecs() function provided
in jiffies.h

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Tobias Klauser authored and Dmitry Torokhov committed Jul 11, 2005
1 parent 6345fdf commit 6f5eacf
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/input/joydev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 6f5eacf

Please sign in to comment.