Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/sis/sis900.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sis/sis900.c 
b/drivers/net/ethernet/sis/sis900.c
index 40bd883..cb61247 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;
-- 
2.7.4

Reply via email to