1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 78a4250e004f..7dd4ded13d97 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3786,8 +3786,7 @@ static int e1000_clean(struct napi_struct *napi, int budget)
         struct net_device *poll_dev = adapter->netdev;
         int tx_cleaned = 0, work_done = 0;
 
-        /* Must NOT use netdev_priv macro here. */
-        adapter = poll_dev->priv;
+        adapter = netdev_priv(poll_dev);
 
         /* e1000_clean is called per-cpu.  This lock protects
          * tx_ring[0] from being cleaned by multiple cpus
@@ -4782,7 +4781,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
                                                 pci_channel_state_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
 
         netif_device_detach(netdev);
 
@@ -4804,7 +4803,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,
 static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         int err;
 
@@ -4838,7 +4837,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
 static void e1000_io_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct e1000_adapter *adapter = netdev->priv;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
         e1000_init_manageability(adapter);