igb: update driver to use setup_timer function

igb was previously setting up all of the timer members itself.  It is
easier to just call setup_timer and reduce the calls to one line.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 3fd2efa91cb..4853a74843e 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1312,13 +1312,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 goto err_eeprom;
         }
 
-        init_timer(&adapter->watchdog_timer);
-        adapter->watchdog_timer.function = &igb_watchdog;
-        adapter->watchdog_timer.data = (unsigned long) adapter;
-
-        init_timer(&adapter->phy_info_timer);
-        adapter->phy_info_timer.function = &igb_update_phy_info;
-        adapter->phy_info_timer.data = (unsigned long) adapter;
+        setup_timer(&adapter->watchdog_timer, &igb_watchdog,
+                    (unsigned long) adapter);
+        setup_timer(&adapter->phy_info_timer, &igb_update_phy_info,
+                    (unsigned long) adapter);
 
         INIT_WORK(&adapter->reset_task, igb_reset_task);
         INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);