From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 7/11] input: use msecs_to_jiffies
Date: Wed, 24 Nov 2004 02:10:19 -0500 [thread overview]
Message-ID: <200411240210.21043.dtor_core@ameritech.net> (raw)
In-Reply-To: <200411240209.49593.dtor_core@ameritech.net>
===================================================================
ChangeSet@1.1962, 2004-11-24 00:41:39-05:00, dtor_core@ameritech.net
Input: use msecs_to_jiffies instead of homegrown ms_to_jiffies
when setting timer for autorepeat handling. This will
make sure that autorepeat is scheduled correctly when
HZ != 1000.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
input.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
===================================================================
diff -Nru a/drivers/input/input.c b/drivers/input/input.c
--- a/drivers/input/input.c 2004-11-24 01:52:55 -05:00
+++ b/drivers/input/input.c 2004-11-24 01:52:55 -05:00
@@ -54,14 +54,6 @@
static int input_devices_state;
#endif
-static inline unsigned int ms_to_jiffies(unsigned int ms)
-{
- unsigned int j;
- j = (ms * HZ + 500) / 1000;
- return (j > 0) ? j : 1;
-}
-
-
void input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
{
struct input_handle *handle;
@@ -96,9 +88,9 @@
change_bit(code, dev->key);
- if (test_bit(EV_REP, dev->evbit) && dev->rep[REP_PERIOD] && dev->timer.data && value) {
+ if (test_bit(EV_REP, dev->evbit) && dev->rep[REP_PERIOD] && dev->rep[REP_DELAY] && dev->timer.data && value) {
dev->repeat_key = code;
- mod_timer(&dev->timer, jiffies + ms_to_jiffies(dev->rep[REP_DELAY]));
+ mod_timer(&dev->timer, jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]));
}
break;
@@ -198,7 +190,8 @@
input_event(dev, EV_KEY, dev->repeat_key, 2);
input_sync(dev);
- mod_timer(&dev->timer, jiffies + ms_to_jiffies(dev->rep[REP_PERIOD]));
+ if (dev->rep[REP_PERIOD])
+ mod_timer(&dev->timer, jiffies + msecs_to_jiffies(dev->rep[REP_PERIOD]));
}
int input_accept_process(struct input_handle *handle, struct file *file)
next prev parent reply other threads:[~2004-11-24 7:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-24 7:05 [PATCH 0/11] New input patches Dmitry Torokhov
2004-11-24 7:06 ` [PATCH 1/11] Atkbd keycodesize fix Dmitry Torokhov
2004-11-24 7:06 ` [PATCH 2/11] Psmouse polling for KVMs Dmitry Torokhov
2004-11-24 7:07 ` [PATCH 3/11] Addd serio_get/put_drvdata functions Dmitry Torokhov
2004-11-24 7:08 ` [PATCH 4/11] Twidjoy build fix Dmitry Torokhov
2004-11-24 7:09 ` [PATCH 5/11] serio - use id matching Dmitry Torokhov
2004-11-24 7:09 ` [PATCH 6/11] serio bus code cleanup Dmitry Torokhov
2004-11-24 7:10 ` Dmitry Torokhov [this message]
2004-11-24 7:10 ` [PATCH 8/11] atkbd: use msecs_to_jiffies Dmitry Torokhov
2004-11-24 7:11 ` [PATCH 9/11] gameport renames part 1 Dmitry Torokhov
2004-11-24 7:11 ` [PATCH 10/11] gameport renames part 2 Dmitry Torokhov
2004-11-24 7:13 ` [PATCH 11/11] gameport: connect/disconnect mandatory Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200411240210.21043.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox