Commit 75d1760f authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman

tty: mips_ejtag_fdc: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c318fa9
...@@ -683,9 +683,9 @@ static irqreturn_t mips_ejtag_fdc_isr(int irq, void *dev_id) ...@@ -683,9 +683,9 @@ static irqreturn_t mips_ejtag_fdc_isr(int irq, void *dev_id)
* It simply triggers the common FDC handler code and arranges for further * It simply triggers the common FDC handler code and arranges for further
* polling. * polling.
*/ */
static void mips_ejtag_fdc_tty_timer(unsigned long opaque) static void mips_ejtag_fdc_tty_timer(struct timer_list *t)
{ {
struct mips_ejtag_fdc_tty *priv = (void *)opaque; struct mips_ejtag_fdc_tty *priv = from_timer(priv, t, poll_timer);
mips_ejtag_fdc_handle(priv); mips_ejtag_fdc_handle(priv);
if (!priv->removing) if (!priv->removing)
...@@ -1002,8 +1002,8 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev) ...@@ -1002,8 +1002,8 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
raw_spin_unlock_irq(&priv->lock); raw_spin_unlock_irq(&priv->lock);
} else { } else {
/* If we didn't get an usable IRQ, poll instead */ /* If we didn't get an usable IRQ, poll instead */
setup_pinned_timer(&priv->poll_timer, mips_ejtag_fdc_tty_timer, timer_setup(&priv->poll_timer, mips_ejtag_fdc_tty_timer,
(unsigned long)priv); TIMER_PINNED);
priv->poll_timer.expires = jiffies + FDC_TTY_POLL; priv->poll_timer.expires = jiffies + FDC_TTY_POLL;
/* /*
* Always attach the timer to the right CPU. The channels are * Always attach the timer to the right CPU. The channels are
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment