Skip to content

Commit 853f90d

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
timers, drivers/tty/mips_ejtag: 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.537448301@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 01bab53 commit 853f90d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/tty/mips_ejtag_fdc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ static void mips_ejtag_fdc_tty_timer(unsigned long opaque)
689689

690690
mips_ejtag_fdc_handle(priv);
691691
if (!priv->removing)
692-
mod_timer_pinned(&priv->poll_timer, jiffies + FDC_TTY_POLL);
692+
mod_timer(&priv->poll_timer, jiffies + FDC_TTY_POLL);
693693
}
694694

695695
/* TTY Port operations */
@@ -1002,7 +1002,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
10021002
raw_spin_unlock_irq(&priv->lock);
10031003
} else {
10041004
/* If we didn't get an usable IRQ, poll instead */
1005-
setup_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer,
1005+
setup_pinned_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer,
10061006
(unsigned long)priv);
10071007
priv->poll_timer.expires = jiffies + FDC_TTY_POLL;
10081008
/*

0 commit comments

Comments
 (0)