Skip to contentSkip to conversation

input/joydev: Remove custom jiffies_to_msecs()

PATCH New Tobias Klauser 1 participant 1 message Mar 24, 2005

Subsystems (2)
Kernel janitors Input drivers
lore
Share & tools
lore

Tobias Klauser

author
#0 lore raw

PATCH 1/1 input/joydev: Remove custom jiffies_to_msecs()

Sorry, the previous patch was completely wrong. Thanks to Nishanth Aravamudan for pointing this out!

Replace the MSECS() macro with the jiffies_to_msecs() function provided in jiffies.h. The current macro is incorrect because HZ can have different values on different architectures.

Signed-off-by Tobias Klauser <[email protected]>
drivers/input/joydev.c +2 -4
diff -urpN linux-2.6.11.orig/drivers/input/joydev.c linux-2.6.11/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_ha
 			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 *
 
 		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;

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors