[PATCH] isdn4linux: Siemens Gigaset drivers: timer usage

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>

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 1163d316f58c1941299a9da2c4cdd6f4b05ef4f4..a607837b9f6ccdaa99077712919f2724793956bd 100644 (file)
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -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);

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index d34f0023ac74eca891a1cc58d0b0f75208552ac3..bc5a6294f0c0c1e51d14b1c2ac55f900e74b522c 100644 (file)
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -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