3 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index c416c18007da..5a96d7611af1 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -5947,8 +5947,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
          * responding after a while.
          *
          * AMD believes this incompatibility is unique to the 5706, and
-         * prefers to locally disable MSI rather than globally disabling it
-         * using pci_msi_quirk.
+         * prefers to locally disable MSI rather than globally disabling it.
          */
         if (CHIP_NUM(bp) == CHIP_NUM_5706 && disable_msi == 0) {
                 struct pci_dev *amd_8132 = NULL;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 222fcd2d10de..619c89218b4b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3584,7 +3584,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
          */
         if (adapter->link_speed == 0)
                 return;
-        if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+        if (pci_channel_offline(pdev))
                 return;
 
         spin_lock_irqsave(&adapter->stats_lock, flags);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 51bd7e8ff0d6..0c3682889344 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1605,7 +1605,7 @@ ixgb_update_stats(struct ixgb_adapter *adapter)
         struct pci_dev *pdev = adapter->pdev;
 
         /* Prevent stats update while adapter is being reset */
-        if (pdev->error_state && pdev->error_state != pci_channel_io_normal)
+        if (pci_channel_offline(pdev))
                 return;
 
         if((netdev->flags & IFF_PROMISC) || (netdev->flags & IFF_ALLMULTI) ||