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

alx: 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: Chris Snook <chris.snook@gmail.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6bf0ad7f

drivers/net/ethernet/atheros/alx/main.c

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

#include <linux/if_vlan.h>

#include <linux/mdio.h>

#include <linux/aer.h>

#include <linux/bitops.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -1745,7 +1744,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_pci_disable;

	}



	pci_enable_pcie_error_reporting(pdev);

	pci_set_master(pdev);



	if (!pdev->pm_cap) {
@@ -1879,7 +1877,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	free_netdev(netdev);

out_pci_release:

	pci_release_mem_regions(pdev);

	pci_disable_pcie_error_reporting(pdev);

out_pci_disable:

	pci_disable_device(pdev);

	return err;
@@ -1897,7 +1894,6 @@ static void alx_remove(struct pci_dev *pdev) 
	iounmap(hw->hw_addr);

	pci_release_mem_regions(pdev);



	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);



	mutex_destroy(&alx->mtx);