Commit 944d5859 authored Jul 31, 2018 by Bjorn Helgaas

PCI/AER: Remove duplicate PCI_EXP_AER_FLAGS definition



PCI_EXP_AER_FLAGS was defined twice (with identical definitions), once
under #ifdef CONFIG_ACPI_APEI, and again at the top level.  This looks like
my merge error from these commits:

  fd3362cb ("PCI/AER: Squash aerdrv_core.c into aerdrv.c")
  41cbc9eb ("PCI/AER: Squash ecrc.c into aerdrv.c")

Remove the duplicate PCI_EXP_AER_FLAGS definition.

Fixes: 41cbc9eb ("PCI/AER: Squash ecrc.c into aerdrv.c")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Oza Pawandeep <poza@codeaurora.org>

parent 89e1f5cb

drivers/pci/pcie/aer.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -329,8 +329,6 @@ int pcie_aer_get_firmware_first(struct pci_dev *dev)
		aer_set_firmware_first(dev);
		return dev->__aer_firmware_first;
		}
		#define PCI_EXP_AER_FLAGS (PCI_EXP_DEVCTL_CERE \| PCI_EXP_DEVCTL_NFERE \| \
		PCI_EXP_DEVCTL_FERE \| PCI_EXP_DEVCTL_URRE)

		static bool aer_firmware_first;

Admin message