Browse Source

net: ti: netcp: use setup_timer

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>
Allen Pais 8 years ago
parent
commit
8447779637
1 changed files with 2 additions and 3 deletions
  1. 2 3
      drivers/net/ethernet/ti/netcp_ethss.c

+ 2 - 3
drivers/net/ethernet/ti/netcp_ethss.c

@@ -3616,9 +3616,8 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
 	}
 	}
 	spin_unlock_bh(&gbe_dev->hw_stats_lock);
 	spin_unlock_bh(&gbe_dev->hw_stats_lock);
 
 
-	init_timer(&gbe_dev->timer);
-	gbe_dev->timer.data	 = (unsigned long)gbe_dev;
-	gbe_dev->timer.function = netcp_ethss_timer;
+	setup_timer(&gbe_dev->timer, netcp_ethss_timer,
+		    (unsigned long)gbe_dev);
 	gbe_dev->timer.expires	 = jiffies + GBE_TIMER_INTERVAL;
 	gbe_dev->timer.expires	 = jiffies + GBE_TIMER_INTERVAL;
 	add_timer(&gbe_dev->timer);
 	add_timer(&gbe_dev->timer);
 	*inst_priv = gbe_dev;
 	*inst_priv = gbe_dev;