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

[PATCH] Char: isicom, use completion

Browse Source 
Use wait_for_completion+complete instead of variables+msleep hack.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jiri Slaby
2006-12-08 02:38:55 -08:00
committed by Linus Torvalds
parent f067137842
commit 906cdecbed
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/isicom.c
View File

@@ -172,6 +172,7 @@ static struct pci_driver isicom_driver = {
static int prev_card = 3; /* start servicing isi_card[0] */ static int prev_card = 3; /* start servicing isi_card[0] */
static struct tty_driver *isicom_normal; static struct tty_driver *isicom_normal;
static DECLARE_COMPLETION(isi_timerdone);
static struct timer_list tx; static struct timer_list tx;
static char re_schedule = 1; static char re_schedule = 1;
@@ -514,7 +515,7 @@ static void isicom_tx(unsigned long _data)
/* schedule another tx for hopefully in about 10ms */ /* schedule another tx for hopefully in about 10ms */
sched_again: sched_again:
if (!re_schedule) { if (!re_schedule) {
re_schedule = 2; complete(&isi_timerdone);
return; return;
} }
@@ -1924,12 +1925,9 @@ error:
static void __exit isicom_exit(void) static void __exit isicom_exit(void)
{ {
unsigned int index = 0;
re_schedule = 0; re_schedule = 0;
while (re_schedule != 2 && index++ < 100) wait_for_completion_timeout(&isi_timerdone, HZ);
msleep(10);
pci_unregister_driver(&isicom_driver); pci_unregister_driver(&isicom_driver);
tty_unregister_driver(isicom_normal); tty_unregister_driver(isicom_normal);