lkml.org 
[lkml]   [2020]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 06/90] e1000e: Drop unnecessary __E1000_DOWN bit twiddling
    Date
    From: Alexander Duyck <alexander.h.duyck@linux.intel.com>

    [ Upstream commit daee5598e491d8d3979bd4ad6c447d89ce57b446 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/e1000e/netdev.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
    index d7d56e42a6aac..aa9fdda839148 100644
    --- a/drivers/net/ethernet/intel/e1000e/netdev.c
    +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
    @@ -7407,15 +7407,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);
    @@ -7435,9 +7433,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))
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-02-03 17:42    [W:8.001 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site