Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-block.git] / drivers / net / ethernet / broadcom / bnxt / bnxt.c

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 808236dc898b8d15fe41dc7f508fe40e87a13000..dceaecab660558c60f6b6dd169b877b17dee09c2 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -48,7 +48,6 @@
 #include <linux/prefetch.h>
 #include <linux/cache.h>
 #include <linux/log2.h>
-#include <linux/aer.h>
 #include <linux/bitmap.h>
 #include <linux/cpu_rmap.h>
 #include <linux/cpumask.h>
@@ -12707,8 +12706,6 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)
                goto init_err_release;
        }
 
-       pci_enable_pcie_error_reporting(pdev);
-
        INIT_WORK(&bp->sp_task, bnxt_sp_task);
        INIT_DELAYED_WORK(&bp->fw_reset_task, bnxt_fw_reset_task);
 
@@ -13188,7 +13185,6 @@ static void bnxt_remove_one(struct pci_dev *pdev)
        bnxt_rdma_aux_device_uninit(bp);
 
        bnxt_ptp_clear(bp);
-       pci_disable_pcie_error_reporting(pdev);
        unregister_netdev(dev);
        clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
        /* Flush any pending tasks */