mirror of https://gitee.com/openkylin/linux.git
e1000e: Drop unnecessary __E1000_DOWN bit twiddling
Since we no longer check for __E1000_DOWN in e1000e_close we can drop the spot where we were restoring the bit. This saves us a bit of unnecessary complexity. Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
a702381940
commit
daee5598e4
drivers/net/ethernet/intel/e1000e
|
@ -7591,15 +7591,13 @@ static void e1000_remove(struct pci_dev *pdev)
|
|||
{
|
||||
struct net_device *netdev = pci_get_drvdata(pdev);
|
||||
struct e1000_adapter *adapter = netdev_priv(netdev);
|
||||
bool down = test_bit(__E1000_DOWN, &adapter->state);
|
||||
|
||||
e1000e_ptp_remove(adapter);
|
||||
|
||||
/* The timers may be rescheduled, so explicitly disable them
|
||||
* from being rescheduled.
|
||||
*/
|
||||
if (!down)
|
||||
set_bit(__E1000_DOWN, &adapter->state);
|
||||
set_bit(__E1000_DOWN, &adapter->state);
|
||||
del_timer_sync(&adapter->phy_info_timer);
|
||||
|
||||
cancel_work_sync(&adapter->reset_task);
|
||||
|
@ -7619,9 +7617,6 @@ static void e1000_remove(struct pci_dev *pdev)
|
|||
}
|
||||
}
|
||||
|
||||
/* Don't lie to e1000_close() down the road. */
|
||||
if (!down)
|
||||
clear_bit(__E1000_DOWN, &adapter->state);
|
||||
unregister_netdev(netdev);
|
||||
|
||||
if (pci_dev_run_wake(pdev))
|
||||
|
|
Loading…
Reference in New Issue