Commit c4342205 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: moxa, fix and optimise empty timer 



moxa, fix and optimise empty timer

don't wait and delete empty timer in empty timer function. Also fire next
empty timer at rounded jiffies to save power.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc37449f

drivers/char/moxa.c

+2 −2
Original line number Diff line number Diff line
@@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned long data) 
	struct moxa_port *ch;



	ch = (struct moxa_port *) data;

	del_timer_sync(&moxa_ports[ch->port].emptyTimer);

	if (ch->tty && (ch->statusflags & EMPTYWAIT)) {

		if (MoxaPortTxQueue(ch->port) == 0) {

			ch->statusflags &= ~EMPTYWAIT;

			tty_wakeup(ch->tty);

			return;

		}

		mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);

		mod_timer(&moxa_ports[ch->port].emptyTimer,

				round_jiffies(jiffies + HZ));

	} else

		ch->statusflags &= ~EMPTYWAIT;

}