aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/slip/slip.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 22:34:40 +0530
committerDavid S. Miller <davem@davemloft.net>2017-09-21 11:44:40 -0700
commit18df06c2cafea69b19ab5f274865b89c3ab0f715 (patch)
treea18b061726c11d789ed765b8d382f301a57fee55 /drivers/net/slip/slip.c
parentdrivers: net: cisco_hdlc: use setup_timer() helper. (diff)
downloadlinux-dev-18df06c2cafea69b19ab5f274865b89c3ab0f715.tar.xz
linux-dev-18df06c2cafea69b19ab5f274865b89c3ab0f715.zip
drivers: net: slip: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/slip/slip.c')
-rw-r--r--drivers/net/slip/slip.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c
index 436dd78c396a..eb8a18991d8c 100644
--- a/drivers/net/slip/slip.c
+++ b/drivers/net/slip/slip.c
@@ -763,12 +763,8 @@ static struct slip *sl_alloc(dev_t line)
sl->mode = SL_MODE_DEFAULT;
#ifdef CONFIG_SLIP_SMART
/* initialize timer_list struct */
- init_timer(&sl->keepalive_timer);
- sl->keepalive_timer.data = (unsigned long)sl;
- sl->keepalive_timer.function = sl_keepalive;
- init_timer(&sl->outfill_timer);
- sl->outfill_timer.data = (unsigned long)sl;
- sl->outfill_timer.function = sl_outfill;
+ setup_timer(&sl->keepalive_timer, sl_keepalive, (unsigned long)sl);
+ setup_timer(&sl->outfill_timer, sl_outfill, (unsigned long)sl);
#endif
slip_devs[i] = dev;
return sl;