Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexander Duyck and committed by
Jeff Kirsher
daee5598 a7023819

+1 -6
+1 -6
drivers/net/ethernet/intel/e1000e/netdev.c
··· 7591 7591 { 7592 7592 struct net_device *netdev = pci_get_drvdata(pdev); 7593 7593 struct e1000_adapter *adapter = netdev_priv(netdev); 7594 - bool down = test_bit(__E1000_DOWN, &adapter->state); 7595 7594 7596 7595 e1000e_ptp_remove(adapter); 7597 7596 7598 7597 /* The timers may be rescheduled, so explicitly disable them 7599 7598 * from being rescheduled. 7600 7599 */ 7601 - if (!down) 7602 - set_bit(__E1000_DOWN, &adapter->state); 7600 + set_bit(__E1000_DOWN, &adapter->state); 7603 7601 del_timer_sync(&adapter->phy_info_timer); 7604 7602 7605 7603 cancel_work_sync(&adapter->reset_task); ··· 7617 7619 } 7618 7620 } 7619 7621 7620 - /* Don't lie to e1000_close() down the road. */ 7621 - if (!down) 7622 - clear_bit(__E1000_DOWN, &adapter->state); 7623 7622 unregister_netdev(netdev); 7624 7623 7625 7624 if (pci_dev_run_wake(pdev))