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/can/grcan.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index a7be12d..8570cfd 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1626,13 +1626,11 @@ static int grcan_setup_netdev(struct platform_device 
*ofdev,
        spin_lock_init(&priv->lock);
 
        if (priv->need_txbug_workaround) {
-               init_timer(&priv->rr_timer);
-               priv->rr_timer.function = grcan_running_reset;
-               priv->rr_timer.data = (unsigned long)dev;
+               setup_timer(&priv->rr_timer, grcan_running_reset,
+                           (unsigned long)dev);
 
-               init_timer(&priv->hang_timer);
-               priv->hang_timer.function = grcan_initiate_running_reset;
-               priv->hang_timer.data = (unsigned long)dev;
+               setup_timer(&priv->hang_timer, grcan_initiate_running_reset,
+                           (unsigned long)dev);
        }
 
        netif_napi_add(dev, &priv->napi, grcan_poll, GRCAN_NAPI_WEIGHT);
-- 
2.7.4

Reply via email to