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

Commit 760141a5 authored by Tejun Heo's avatar Tejun Heo
Browse files

igb[v],ixgbe: don't use flush_scheduled_work() 



All three drivers use flush_scheduled_work() similarly during driver
detach.  Replace it with explicit cancels.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: e1000-devel@lists.sourceforge.net
Cc: netdev@vger.kernel.org
parent 9beb4896

drivers/net/igb/igb_main.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -2050,13 +2050,16 @@ static void __devexit igb_remove(struct pci_dev *pdev) 
	struct igb_adapter *adapter = netdev_priv(netdev);

	struct igb_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	struct e1000_hw *hw = &adapter->hw;





	/* flush_scheduled work may reschedule our watchdog task, so

	/*

	 * explicitly disable watchdog tasks from being rescheduled  */

	 * The watchdog timer may be rescheduled, so explicitly

	 * disable watchdog from being rescheduled.

	 */

	set_bit(__IGB_DOWN, &adapter->state);

	set_bit(__IGB_DOWN, &adapter->state);

	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->phy_info_timer);

	del_timer_sync(&adapter->phy_info_timer);





	flush_scheduled_work();

	cancel_work_sync(&adapter->reset_task);

	cancel_work_sync(&adapter->watchdog_task);





#ifdef CONFIG_IGB_DCA

#ifdef CONFIG_IGB_DCA

	if (adapter->flags & IGB_FLAG_DCA_ENABLED) {

	if (adapter->flags & IGB_FLAG_DCA_ENABLED) {

drivers/net/igbvf/netdev.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -2825,13 +2825,14 @@ static void __devexit igbvf_remove(struct pci_dev *pdev) 
	struct e1000_hw *hw = &adapter->hw;

	struct e1000_hw *hw = &adapter->hw;





	/*

	/*

	 * flush_scheduled work may reschedule our watchdog task, so

	 * The watchdog timer may be rescheduled, so explicitly

	 * explicitly disable watchdog tasks from being rescheduled

	 * disable it from being rescheduled.

	 */

	 */

	set_bit(__IGBVF_DOWN, &adapter->state);

	set_bit(__IGBVF_DOWN, &adapter->state);

	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->watchdog_timer);





	flush_scheduled_work();

	cancel_work_sync(&adapter->reset_task);

	cancel_work_sync(&adapter->watchdog_task);





	unregister_netdev(netdev);

	unregister_netdev(netdev);

drivers/net/ixgbe/ixgbe_main.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -7373,13 +7373,15 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 
	struct net_device *netdev = adapter->netdev;

	struct net_device *netdev = adapter->netdev;





	set_bit(__IXGBE_DOWN, &adapter->state);

	set_bit(__IXGBE_DOWN, &adapter->state);

	/* clear the module not found bit to make sure the worker won't



	 * reschedule

	/*

	 * The timers may be rescheduled, so explicitly disable them

	 * from being rescheduled.

	 */

	 */

	clear_bit(__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state);

	clear_bit(__IXGBE_SFP_MODULE_NOT_FOUND, &adapter->state);

	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->watchdog_timer);



	del_timer_sync(&adapter->sfp_timer);

	del_timer_sync(&adapter->sfp_timer);



	cancel_work_sync(&adapter->watchdog_task);

	cancel_work_sync(&adapter->watchdog_task);

	cancel_work_sync(&adapter->sfp_task);

	cancel_work_sync(&adapter->sfp_task);

	cancel_work_sync(&adapter->multispeed_fiber_task);

	cancel_work_sync(&adapter->multispeed_fiber_task);
@@ -7387,7 +7389,8 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) 
	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE ||

	if (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE ||

	    adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)

	    adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE)

		cancel_work_sync(&adapter->fdir_reinit_task);

		cancel_work_sync(&adapter->fdir_reinit_task);

	flush_scheduled_work();

	if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE)

		cancel_work_sync(&adapter->check_overtemp_task);





#ifdef CONFIG_IXGBE_DCA

#ifdef CONFIG_IXGBE_DCA

	if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {

	if (adapter->flags & IXGBE_FLAG_DCA_ENABLED) {