lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Char: cyclades, timer cleanup

Browse Source 
cyclades, timer cleanup

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
2007-05-08 00:35:48 -07:00
committed by Linus Torvalds
parent db05c3b1dd
commit b70509066c
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/char/cyclades.c
View File

@@ -851,7 +851,6 @@ static void cyz_poll(unsigned long);
/* The Cyclades-Z polling cycle is defined by this variable */ /* The Cyclades-Z polling cycle is defined by this variable */
static long cyz_polling_cycle = CZ_DEF_POLL; static long cyz_polling_cycle = CZ_DEF_POLL;
static int cyz_timeron = 0;
static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0); static DEFINE_TIMER(cyz_timerlist, cyz_poll, 0, 0);
#else /* CONFIG_CYZ_INTR */ #else /* CONFIG_CYZ_INTR */
@@ -1906,9 +1905,9 @@ static void cyz_poll(unsigned long arg)
static volatile struct BOARD_CTRL *board_ctrl; static volatile struct BOARD_CTRL *board_ctrl;
static volatile struct CH_CTRL *ch_ctrl; static volatile struct CH_CTRL *ch_ctrl;
static volatile struct BUF_CTRL *buf_ctrl; static volatile struct BUF_CTRL *buf_ctrl;
unsigned long expires = jiffies + HZ;
int card, port; int card, port;
cyz_timerlist.expires = jiffies + (HZ);
for (card = 0; card < NR_CARDS; card++) { for (card = 0; card < NR_CARDS; card++) {
cinfo = &cy_card[card]; cinfo = &cy_card[card];
@@ -1942,9 +1941,9 @@ static void cyz_poll(unsigned long arg)
cyz_handle_tx(info, ch_ctrl, buf_ctrl); cyz_handle_tx(info, ch_ctrl, buf_ctrl);
} }
/* poll every 'cyz_polling_cycle' period */ /* poll every 'cyz_polling_cycle' period */
cyz_timerlist.expires = jiffies + cyz_polling_cycle; expires = jiffies + cyz_polling_cycle;
} }
add_timer(&cyz_timerlist); mod_timer(&cyz_timerlist, expires);
} /* cyz_poll */ } /* cyz_poll */
#endif /* CONFIG_CYZ_INTR */ #endif /* CONFIG_CYZ_INTR */
@@ -5504,10 +5503,8 @@ static int __init cy_init(void)
} }
#ifndef CONFIG_CYZ_INTR #ifndef CONFIG_CYZ_INTR
if (number_z_boards && !cyz_timeron) { if (number_z_boards) {
cyz_timeron++; mod_timer(&cyz_timerlist, jiffies + 1);
cyz_timerlist.expires = jiffies + 1;
add_timer(&cyz_timerlist);
#ifdef CY_PCI_DEBUG #ifdef CY_PCI_DEBUG
printk("Cyclades-Z polling initialized\n"); printk("Cyclades-Z polling initialized\n");
#endif #endif
@@ -5523,10 +5520,7 @@ static void __exit cy_cleanup_module(void)
int i, e1; int i, e1;
#ifndef CONFIG_CYZ_INTR #ifndef CONFIG_CYZ_INTR
if (cyz_timeron){ del_timer_sync(&cyz_timerlist);
cyz_timeron = 0;
del_timer(&cyz_timerlist);
}
#endif /* CONFIG_CYZ_INTR */ #endif /* CONFIG_CYZ_INTR */
if ((e1 = tty_unregister_driver(cy_serial_driver))) if ((e1 = tty_unregister_driver(cy_serial_driver)))