Message ID | 20191011153459.22313.17985.stgit@localhost.localdomain |
---|---|
State | Accepted |
Delegated to: | Jeff Kirsher |
Headers | show |
Series | Address IRQ related crash seen due to io_perm_failure | expand |
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Alexander Duyck > Sent: Friday, October 11, 2019 8:35 AM > To: alexander.h.duyck@linux.intel.com; intel-wired-lan@lists.osuosl.org; > Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com> > Cc: netdev@vger.kernel.org; zdai@us.ibm.com; zdai@linux.vnet.ibm.com > Subject: [Intel-wired-lan] [next-queue PATCH v2 2/2] e1000e: Drop > unnecessary __E1000_DOWN bit twiddling > > From: Alexander Duyck <alexander.h.duyck@linux.intel.com> > > 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> > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index db1591eef28e..c31259dde78d 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7409,15 +7409,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); @@ -7437,9 +7435,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))