Ver Fonte

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: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jiri Slaby há 18 anos atrás
pai
commit
c43422053b
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      drivers/char/moxa.c

+ 2 - 2
drivers/char/moxa.c

@@ -1040,14 +1040,14 @@ static void check_xmit_empty(unsigned long data)
 	struct moxa_port *ch;
 	struct moxa_port *ch;
 
 
 	ch = (struct moxa_port *) data;
 	ch = (struct moxa_port *) data;
-	del_timer_sync(&moxa_ports[ch->port].emptyTimer);
 	if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
 	if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
 		if (MoxaPortTxQueue(ch->port) == 0) {
 		if (MoxaPortTxQueue(ch->port) == 0) {
 			ch->statusflags &= ~EMPTYWAIT;
 			ch->statusflags &= ~EMPTYWAIT;
 			tty_wakeup(ch->tty);
 			tty_wakeup(ch->tty);
 			return;
 			return;
 		}
 		}
-		mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);
+		mod_timer(&moxa_ports[ch->port].emptyTimer,
+				round_jiffies(jiffies + HZ));
 	} else
 	} else
 		ch->statusflags &= ~EMPTYWAIT;
 		ch->statusflags &= ~EMPTYWAIT;
 }
 }