Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0544b04b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h 



Move pcie_aer_get_firmware_first() to portdrv.h, where it can be more
easily shared between AER and DPC.  Then DPC no longer needs to include
aer/aerdrv.h.  No functional change intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
parent 16c33b15

drivers/pci/pcie/aer/aerdrv.h

+0 −10
Original line number Diff line number Diff line
@@ -78,14 +78,4 @@ struct aer_rpc { 


irqreturn_t aer_irq(int irq, void *context);



#ifdef CONFIG_ACPI_APEI

int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);

#else

static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)

{

	if (pci_dev->__aer_firmware_first_valid)

		return pci_dev->__aer_firmware_first;

	return 0;

}

#endif

#endif /* _AERDRV_H_ */

drivers/pci/pcie/dpc.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include "portdrv.h"

#include "../pci.h"

#include "aer/aerdrv.h"



struct dpc_dev {

	struct pcie_device	*dev;

drivers/pci/pcie/portdrv.h

+11 −0
Original line number Diff line number Diff line
@@ -110,6 +110,17 @@ static inline bool pcie_pme_no_msi(void) { return false; } 
static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {}

#endif /* !CONFIG_PCIE_PME */



#ifdef CONFIG_ACPI_APEI

int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);

#else

static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)

{

	if (pci_dev->__aer_firmware_first_valid)

		return pci_dev->__aer_firmware_first;

	return 0;

}

#endif



struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,

							u32 service);

struct device *pcie_port_find_device(struct pci_dev *dev, u32 service);