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

octeon_ep: 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: Veerasenareddy Burru <vburru@marvell.com>
Cc: Abhijit Ayarekar <aayarekar@marvell.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2d0e0372

drivers/net/ethernet/marvell/octeon_ep/octep_main.c

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

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/aer.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/rtnetlink.h>
@@ -1050,7 +1049,6 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_pci_regions;

	}



	pci_enable_pcie_error_reporting(pdev);

	pci_set_master(pdev);



	netdev = alloc_etherdev_mq(sizeof(struct octep_device),
@@ -1106,7 +1104,6 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
err_octep_config:

	free_netdev(netdev);

err_alloc_netdev:

	pci_disable_pcie_error_reporting(pdev);

	pci_release_mem_regions(pdev);

err_pci_regions:

err_dma_mask:
@@ -1139,7 +1136,6 @@ static void octep_remove(struct pci_dev *pdev) 
	octep_device_cleanup(oct);

	pci_release_mem_regions(pdev);

	free_netdev(netdev);

	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

}