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

netxen_nic: 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.

Also note that the driver only called these for NX_IS_REVISION_P3 devices,
so since f26e58bf, error reporting has been enabled for devices other
than NX_IS_REVISION_P3.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Manish Chopra <manishc@marvell.com>
Cc: Rahul Verma <rahulv@marvell.com>
Cc: GR-Linux-NIC-Dev@marvell.com
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c183033f

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+1 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/ipv6.h>

#include <linux/inetdevice.h>

#include <linux/sysfs.h>

#include <linux/aer.h>



MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Intelligent Ethernet Driver");

MODULE_LICENSE("GPL");
@@ -1464,9 +1463,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if ((err = pci_request_regions(pdev, netxen_nic_driver_name)))

		goto err_out_disable_pdev;



	if (NX_IS_REVISION_P3(pdev->revision))

		pci_enable_pcie_error_reporting(pdev);



	pci_set_master(pdev);



	netdev = alloc_etherdev(sizeof(struct netxen_adapter));
@@ -1603,8 +1599,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	free_netdev(netdev);



err_out_free_res:

	if (NX_IS_REVISION_P3(pdev->revision))

		pci_disable_pcie_error_reporting(pdev);

	pci_release_regions(pdev);



err_out_disable_pdev:
@@ -1659,10 +1653,8 @@ static void netxen_nic_remove(struct pci_dev *pdev) 


	netxen_release_firmware(adapter);



	if (NX_IS_REVISION_P3(pdev->revision)) {

	if (NX_IS_REVISION_P3(pdev->revision))

		netxen_cleanup_minidump(adapter);

		pci_disable_pcie_error_reporting(pdev);

	}



	pci_release_regions(pdev);

	pci_disable_device(pdev);