Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e340485 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

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: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c493ea45

drivers/net/igb/igb_main.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -1312,13 +1312,10 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
		goto err_eeprom;

		goto err_eeprom;

	}

	}





	init_timer(&adapter->watchdog_timer);

	setup_timer(&adapter->watchdog_timer, &igb_watchdog,

	adapter->watchdog_timer.function = &igb_watchdog;

	            (unsigned long) adapter);

	adapter->watchdog_timer.data = (unsigned long) adapter;

	setup_timer(&adapter->phy_info_timer, &igb_update_phy_info,



	            (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;





	INIT_WORK(&adapter->reset_task, igb_reset_task);

	INIT_WORK(&adapter->reset_task, igb_reset_task);

	INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);

	INIT_WORK(&adapter->watchdog_task, igb_watchdog_task);