qlcnic: Drop redundant pci_enable_pcie_error_reporting()
pci_enable_pcie_error_reporting() enables the device to send ERR_* Messages. Since f26e58bf6f54 ("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: Bjorn Helgaas <bhelgaas@google.com> Cc: Shahed Shaikh <shshaikh@marvell.com> Cc: Manish Chopra <manishc@marvell.com> Cc: GR-Linux-NIC-Dev@marvell.com Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
5f1fbdc168
commit
95e35f5994
@ -12,7 +12,6 @@
|
||||
#include <net/ip.h>
|
||||
#include <linux/ipv6.h>
|
||||
#include <linux/inetdevice.h>
|
||||
#include <linux/aer.h>
|
||||
#include <linux/log2.h>
|
||||
#include <linux/pci.h>
|
||||
#include <net/vxlan.h>
|
||||
@ -2445,7 +2444,6 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
goto err_out_disable_pdev;
|
||||
|
||||
pci_set_master(pdev);
|
||||
pci_enable_pcie_error_reporting(pdev);
|
||||
|
||||
ahw = kzalloc(sizeof(struct qlcnic_hardware_context), GFP_KERNEL);
|
||||
if (!ahw) {
|
||||
@ -2675,7 +2673,6 @@ err_out_free_hw_res:
|
||||
kfree(ahw);
|
||||
|
||||
err_out_free_res:
|
||||
pci_disable_pcie_error_reporting(pdev);
|
||||
pci_release_regions(pdev);
|
||||
|
||||
err_out_disable_pdev:
|
||||
@ -2757,7 +2754,6 @@ static void qlcnic_remove(struct pci_dev *pdev)
|
||||
|
||||
qlcnic_release_firmware(adapter);
|
||||
|
||||
pci_disable_pcie_error_reporting(pdev);
|
||||
pci_release_regions(pdev);
|
||||
pci_disable_device(pdev);
|
||||
|
||||
|
@ -12,7 +12,6 @@
|
||||
#include <linux/ipv6.h>
|
||||
#include <linux/inetdevice.h>
|
||||
#include <linux/sysfs.h>
|
||||
#include <linux/aer.h>
|
||||
#include <linux/log2.h>
|
||||
#ifdef CONFIG_QLCNIC_HWMON
|
||||
#include <linux/hwmon.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user