Commit ca7f175f authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jakub Kicinski
Browse files

cxgb4: Drop redundant pci_enable_pcie_error_reporting() 



pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since f26e58bf ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration, so the
driver doesn't need to do it itself.

Remove the redundant pci_enable_pcie_error_reporting() call from the
driver.  Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.

Note that this only controls ERR_* Messages from the device.  An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Raju Rangoju <rajur@chelsio.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f29b73d

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+0 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <linux/mutex.h>

#include <linux/netdevice.h>

#include <linux/pci.h>

#include <linux/aer.h>

#include <linux/rtnetlink.h>

#include <linux/sched.h>

#include <linux/seq_file.h>
@@ -6687,7 +6686,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_free_adapter;

	}



	pci_enable_pcie_error_reporting(pdev);

	pci_set_master(pdev);

	pci_save_state(pdev);

	adap_idx++;
@@ -7092,7 +7090,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
 out_unmap_bar0:

	iounmap(regs);

 out_disable_device:

	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

 out_release_regions:

	pci_release_regions(pdev);
@@ -7171,7 +7168,6 @@ static void remove_one(struct pci_dev *pdev) 
	}

#endif

	iounmap(adapter->regs);

	pci_disable_pcie_error_reporting(pdev);

	if ((adapter->flags & CXGB4_DEV_ENABLED)) {

		pci_disable_device(pdev);

		adapter->flags &= ~CXGB4_DEV_ENABLED;