Commit d7ba1064 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Martin K. Petersen
Browse files

scsi: qla4xxx: Drop redundant pci_enable_pcie_error_reporting() 



pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since commit 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>
Link: https://lore.kernel.org/r/20230307182842.870378-11-helgaas@kernel.org


Cc: Nilesh Javali <njavali@marvell.com>
Cc: Manish Rangankar <mrangankar@marvell.com>
Cc: GR-QLogic-Storage-Upstream@marvell.com
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c5c440bb

drivers/scsi/qla4xxx/ql4_def.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/mutex.h>

#include <linux/aer.h>

#include <linux/bsg-lib.h>

#include <linux/vmalloc.h>

drivers/scsi/qla4xxx/ql4_os.c

+0 −4
Original line number Diff line number Diff line
@@ -8639,8 +8639,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, 
	ha->host_no = host->host_no;

	ha->func_num = PCI_FUNC(ha->pdev->devfn);



	pci_enable_pcie_error_reporting(pdev);



	/* Setup Runtime configurable options */

	if (is_qla8022(ha)) {

		ha->isp_ops = &qla4_82xx_isp_ops;
@@ -8867,7 +8865,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, 
	qla4xxx_free_adapter(ha);



probe_failed_ioconfig:

	pci_disable_pcie_error_reporting(pdev);

	scsi_host_put(ha->host);



probe_disable_device:
@@ -9022,7 +9019,6 @@ static void qla4xxx_remove_adapter(struct pci_dev *pdev) 


	scsi_host_put(ha->host);



	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

}