e1000e: Drop unnecessary __E1000_DOWN bit twiddling (daee5598) · Commits · 戴 / test

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>

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -7591,14 +7591,12 @@ 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);
		del_timer_sync(&adapter->phy_info_timer);

		@@ -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))

Admin message