The AER code is scattered across several files and buried a little too deep in the hierarchy, which makes it a bit of a hassle to browse. Consolidate it all in a single file (plus the optional aer_inject module) and move it up one level to drivers/pci/pcie/aer.c. This is all pure code moves; no functional changes intended. --- Bjorn Helgaas (13): PCI/AER: Remove forward declarations PCI/AER: Reorder code to group probe/remove stuff together PCI/AER: Squash aerdrv_core.c into aerdrv.c PCI/AER: Squash aerdrv_errprint.c into aerdrv.c PCI/AER: Squash aerdrv_acpi.c into aerdrv.c PCI/AER: Squash ecrc.c into aerdrv.c PCI/AER: Remove duplicate pcie_port_bus_type declaration PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h PCI/AER: Move aer_irq() declaration to portdrv.h PCI/AER: Move private AER things to aerdrv.c PCI/AER: Squash Kconfig.debug into Kconfig PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/ PCI/AER: Use "PCI Express" consistently in Kconfig text drivers/pci/pcie/Kconfig | 41 + drivers/pci/pcie/Makefile | 3 drivers/pci/pcie/aer.c | 1377 ++++++++++++++++++++++++++++++++ drivers/pci/pcie/aer/Kconfig | 29 - drivers/pci/pcie/aer/Kconfig.debug | 19 drivers/pci/pcie/aer/Makefile | 13 drivers/pci/pcie/aer/aer_inject.c | 550 ------------- drivers/pci/pcie/aer/aerdrv.c | 371 --------- drivers/pci/pcie/aer/aerdrv.h | 95 -- drivers/pci/pcie/aer/aerdrv_acpi.c | 141 --- drivers/pci/pcie/aer/aerdrv_core.c | 496 ------------ drivers/pci/pcie/aer/aerdrv_errprint.c | 260 ------ drivers/pci/pcie/aer/ecrc.c | 117 --- drivers/pci/pcie/aer_inject.c | 551 +++++++++++++ drivers/pci/pcie/dpc.c | 1 drivers/pci/pcie/portdrv.h | 15 16 files changed, 1983 insertions(+), 2096 deletions(-) create mode 100644 drivers/pci/pcie/aer.c delete mode 100644 drivers/pci/pcie/aer/Kconfig delete mode 100644 drivers/pci/pcie/aer/Kconfig.debug delete mode 100644 drivers/pci/pcie/aer/Makefile delete mode 100644 drivers/pci/pcie/aer/aer_inject.c delete mode 100644 drivers/pci/pcie/aer/aerdrv.c delete mode 100644 drivers/pci/pcie/aer/aerdrv.h delete mode 100644 drivers/pci/pcie/aer/aerdrv_acpi.c delete mode 100644 drivers/pci/pcie/aer/aerdrv_core.c delete mode 100644 drivers/pci/pcie/aer/aerdrv_errprint.c delete mode 100644 drivers/pci/pcie/aer/ecrc.c create mode 100644 drivers/pci/pcie/aer_inject.c