From: Marcelo Feitoza Parisi <[EMAIL PROTECTED]>
They deal with wrapping correctly and are nicer to read.
Signed-off-by: Marcelo Feitoza Parisi <[EMAIL PROTECTED]>
Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
---
drivers/usb/input/ati_remote.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -96,6 +96,7 @@
#include <linux/usb.h>
#include <linux/usb_input.h>
#include <linux/wait.h>
+#include <linux/jiffies.h>
/*
* Module and Version Information, Module Parameters
@@ -472,7 +473,7 @@ static void ati_remote_input_report(stru
/* Filter duplicate events which happen "too close" together. */
if ((ati_remote->old_data[0] == data[1]) &&
(ati_remote->old_data[1] == data[2]) &&
- ((ati_remote->old_jiffies + FILTER_TIME) > jiffies)) {
+ time_before(jiffies, ati_remote->old_jiffies +
FILTER_TIME)) {
ati_remote->repeat_count++;
} else {
ati_remote->repeat_count = 0;
@@ -507,16 +508,16 @@ static void ati_remote_input_report(stru
* pad down, so we increase acceleration, ramping up over two seconds to
* a maximum speed. The acceleration curve is #defined above.
*/
- if ((jiffies - ati_remote->old_jiffies) > (HZ >> 2)) {
+ if (time_after(jiffies, ati_remote->old_jiffies + (HZ >> 2))) {
acc = 1;
ati_remote->acc_jiffies = jiffies;
}
- else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 3)) acc =
accel[0];
- else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 2)) acc =
accel[1];
- else if ((jiffies - ati_remote->acc_jiffies) < (HZ >> 1)) acc =
accel[2];
- else if ((jiffies - ati_remote->acc_jiffies) < HZ ) acc =
accel[3];
- else if ((jiffies - ati_remote->acc_jiffies) < HZ+(HZ>>1)) acc =
accel[4];
- else if ((jiffies - ati_remote->acc_jiffies) < (HZ << 1)) acc =
accel[5];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 3)))
acc = accel[0];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 2)))
acc = accel[1];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ >> 1)))
acc = accel[2];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + HZ))
acc = accel[3];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + HZ+(HZ>>1)))
acc = accel[4];
+ else if (time_before(jiffies, ati_remote->acc_jiffies + (HZ << 1)))
acc = accel[5];
else acc = accel[6];
input_regs(dev, regs);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
