aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sis/sis900.c
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 22:35:01 +0530
committerDavid S. Miller <davem@davemloft.net>2017-09-21 11:44:42 -0700
commitac803d1c5f62937dc142a35dafd180f09b9f9c83 (patch)
tree57ee6bef1a928a92d94a11ef53cc8c02d3adee94 /drivers/net/ethernet/sis/sis900.c
parentdrivers: net: sun: use setup_timer() helper. (diff)
downloadlinux-dev-ac803d1c5f62937dc142a35dafd180f09b9f9c83.tar.xz
linux-dev-ac803d1c5f62937dc142a35dafd180f09b9f9c83.zip
drivers: net: sis900: 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/ethernet/sis/sis900.c')
-rw-r--r--drivers/net/ethernet/sis/sis900.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 40bd88362e3d..cb61247b0526 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1065,10 +1065,8 @@ sis900_open(struct net_device *net_dev)
/* Set the timer to switch to check for link beat and perhaps switch
to an alternate media type. */
- init_timer(&sis_priv->timer);
+ setup_timer(&sis_priv->timer, sis900_timer, (unsigned long)net_dev);
sis_priv->timer.expires = jiffies + HZ;
- sis_priv->timer.data = (unsigned long)net_dev;
- sis_priv->timer.function = sis900_timer;
add_timer(&sis_priv->timer);
return 0;