Commit 129aaabc authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next 

* pci/aer:
  PCI/AER: Use list_first_entry_or_null() to simplify code
  PCI/AER: Restore pci_ops pointer while calling original pci_ops
  PCI/AER: Rename pci_ops_aer to aer_inj_pci_ops

* pci/misc:
  PCI: Remove includes of asm/pci-bridge.h
  PCI: Remove empty asm-generic/pci-bridge.h
  ARM64: PCI: Remove generated include of asm-generic/pci-bridge.h
  PCI: Remove includes of empty asm-generic/pci-bridge.h
  PCI: Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h
  PCI/PME: Restructure pcie_pme_suspend() to prevent compiler warning
  PCI/PME: Remove redundant port lookup
  PCI: Check device_attach() return value always

* pci/virtualization:
  PCI: Add ACS quirk for all Cavium devices
parents 92e963f5 0e6053dc 952bbcb0 b404bcfb

arch/alpha/include/asm/pci.h

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

#include <linux/scatterlist.h>

#include <asm/machvec.h>

#include <asm-generic/pci-bridge.h>



/*

 * The following structure is used to manage multiple PCI busses.

arch/arm/include/asm/pci.h

+0 −3
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#ifdef __KERNEL__

#include <asm-generic/pci-dma-compat.h>

#include <asm-generic/pci-bridge.h>



#include <asm/mach/pci.h> /* for pci_sys_data */



extern unsigned long pcibios_min_io;
@@ -41,5 +39,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
}



#endif /* __KERNEL__ */

 

#endif

arch/arm64/include/asm/Kbuild

+0 −3
Original line number Diff line number Diff line 




generic-y += bug.h

generic-y += bugs.h

generic-y += checksum.h
@@ -31,7 +29,6 @@ generic-y += msgbuf.h 
generic-y += msi.h

generic-y += mutex.h

generic-y += pci.h

generic-y += pci-bridge.h

generic-y += poll.h

generic-y += preempt.h

generic-y += resource.h

arch/arm64/include/asm/pci.h

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



#include <asm/io.h>

#include <asm-generic/pci-bridge.h>

#include <asm-generic/pci-dma-compat.h>



#define PCIBIOS_MIN_IO		0x1000

arch/arm64/kernel/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/of_platform.h>

#include <linux/slab.h>



#include <asm/pci-bridge.h>



/*

 * Called after each bus is probed, but before its children are examined

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE