Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: sccnxp: Convert timers to use timer_setup()

Browse Source 
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>
Cc: linux-serial@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2017-10-24 02:59:49 -07:00 committed by Greg Kroah-Hartman
parent 1209a81369
commit fc3b00d7dd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/tty/serial/sccnxp.c
View File

@ -465,9 +465,9 @@ static void sccnxp_handle_events(struct sccnxp_port *s)
} while (1); } while (1);
} }
static void sccnxp_timer(unsigned long data) static void sccnxp_timer(struct timer_list *t)
{ {
struct sccnxp_port *s = (struct sccnxp_port *)data; struct sccnxp_port *s = from_timer(s, t, timer);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&s->lock, flags); spin_lock_irqsave(&s->lock, flags);
@ -987,8 +987,7 @@ static int sccnxp_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Unable to reguest IRQ %i\n", s->irq); dev_err(&pdev->dev, "Unable to reguest IRQ %i\n", s->irq);
} else { } else {
init_timer(&s->timer); timer_setup(&s->timer, sccnxp_timer, 0);
setup_timer(&s->timer, sccnxp_timer, (unsigned long)s);
mod_timer(&s->timer, jiffies + mod_timer(&s->timer, jiffies +
usecs_to_jiffies(s->pdata.poll_time_us)); usecs_to_jiffies(s->pdata.poll_time_us));
return 0; return 0;