Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-25 01:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] isdn4linux: Siemens Gigaset drivers: timer usage

Browse Source 
With Hansjoerg Lipp <hjlipp@web.de>

Correct timer usage in the Gigaset drivers to take advantage of the existing
setup_timer() function, and use milliseconds as unit.

Signed-off-by: Hansjoerg Lipp <hjlipp@web.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Tilman Schmidt 2006-04-10 22:55:03 -07:00 committed by Linus Torvalds
parent bd0d6ef944
commit ec81b5e629
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/isdn/gigaset/common.c
View File

@ -219,7 +219,7 @@ static void timer_tick(unsigned long data)
timeout = 1;
if (atomic_read(&cs->running)) {
mod_timer(&cs->timer, jiffies + GIG_TICK);
mod_timer(&cs->timer, jiffies + msecs_to_jiffies(GIG_TICK));
if (timeout) {
dbg(DEBUG_CMD, "scheduling timeout");
tasklet_schedule(&cs->event_tasklet);
@ -685,9 +685,8 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
gigaset_if_init(cs);
atomic_set(&cs->running, 1);
cs->timer.data = (unsigned long) cs;
cs->timer.function = timer_tick;
cs->timer.expires = jiffies + GIG_TICK;
setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK);
/* FIXME: can jiffies increase too much until the timer is added?
* Same problem(?) with mod_timer() in timer_tick(). */
add_timer(&cs->timer);

2
drivers/isdn/gigaset/gigaset.h
View File

@ -58,7 +58,7 @@
#define MAX_TIMER_INDEX 1000
#define MAX_SEQ_INDEX 1000
#define GIG_TICK (HZ / 10)
#define GIG_TICK 100 /* in milliseconds */
/* timeout values (unit: 1 sec) */
#define INIT_TIMEOUT 1