Skip to content

Commit 01bab53

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
timers, drivers/tty/metag_da: Initialize the poll timer as pinned
Pinned timers must carry the pinned attribute in the timer structure itself, so convert the code to the new API. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Chris Mason <clm@fb.com> Cc: Eric Dumazet <edumazet@google.com> Cc: George Spelvin <linux@sciencehorizons.net> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Len Brown <lenb@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: rt@linutronix.de Link: http://lkml.kernel.org/r/20160704094341.456452642@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 25df576 commit 01bab53

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/tty/metag_da.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored)
323323
if (channel >= 0)
324324
fetch_data(channel);
325325

326-
mod_timer_pinned(&poll_timer, jiffies + DA_TTY_POLL);
326+
mod_timer(&poll_timer, jiffies + DA_TTY_POLL);
327327
}
328328

329329
static void add_poll_timer(struct timer_list *poll_timer)
330330
{
331-
setup_timer(poll_timer, dashtty_timer, 0);
331+
setup_pinned_timer(poll_timer, dashtty_timer, 0);
332332
poll_timer->expires = jiffies + DA_TTY_POLL;
333333

334334
/*

0 commit comments

Comments
 (0)