[PATCH 59/64] drivers: net: i40evf: use setup_timer() helper.

[Allen Pais]

    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/intel/i40evf/i40evf_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c 
b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 1825d95..c243f9d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2686,9 +2686,8 @@ static void i40evf_init_task(struct work_struct *work)
                ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
        }
 
-       init_timer(&adapter->watchdog_timer);
-       adapter->watchdog_timer.function = &i40evf_watchdog_timer;
-       adapter->watchdog_timer.data = (unsigned long)adapter;
+       setup_timer(&adapter->watchdog_timer, &i40evf_watchdog_timer,
+                   (unsigned long)adapter);
        mod_timer(&adapter->watchdog_timer, jiffies + 1);
 
        adapter->tx_desc_count = I40EVF_DEFAULT_TXD;
-- 
2.7.4