Skip to content

Commit

Permalink
[PATCH] Char: isicom, use completion
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent f067137 commit 906cdec
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/char/isicom.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ static struct pci_driver isicom_driver = {
static int prev_card = 3; /* start servicing isi_card[0] */
static struct tty_driver *isicom_normal;

static DECLARE_COMPLETION(isi_timerdone);
static struct timer_list tx;
static char re_schedule = 1;

Expand Down Expand Up @@ -514,7 +515,7 @@ static void isicom_tx(unsigned long _data)
/* schedule another tx for hopefully in about 10ms */
sched_again:
if (!re_schedule) {
re_schedule = 2;
complete(&isi_timerdone);
return;
}

Expand Down Expand Up @@ -1924,12 +1925,9 @@ static int __init isicom_init(void)

static void __exit isicom_exit(void)
{
unsigned int index = 0;

re_schedule = 0;

while (re_schedule != 2 && index++ < 100)
msleep(10);
wait_for_completion_timeout(&isi_timerdone, HZ);

pci_unregister_driver(&isicom_driver);
tty_unregister_driver(isicom_normal);
Expand Down

0 comments on commit 906cdec

Please sign in to comment.