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

Commit 60ed982a authored by Rajat Jain's avatar Rajat Jain Committed by Bjorn Helgaas
Browse files

PCI/AER: Move internal declarations to drivers/pci/pci.h 



Since pci_aer_init() and pci_no_aer() are used only internally, move their
declarations to the PCI internal header file.  Also, no one cares about
return value of pci_aer_init(), so make it void.

Signed-off-by: default avatarRajat Jain <rajatja@google.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent bd237801

drivers/pci/pci.h

+8 −0
Original line number Diff line number Diff line
@@ -480,4 +480,12 @@ static inline int devm_of_pci_get_host_bridge_resources(struct device *dev, 
}

#endif



#ifdef CONFIG_PCIEAER

void pci_no_aer(void);

void pci_aer_init(struct pci_dev *dev);

#else

static inline void pci_no_aer(void) { }

static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }

#endif



#endif /* DRIVERS_PCI_H */

drivers/pci/pcie/aer.c

+2 −2
Original line number Diff line number Diff line
@@ -382,10 +382,10 @@ int pci_cleanup_aer_error_status_regs(struct pci_dev *dev) 
	return 0;

}



int pci_aer_init(struct pci_dev *dev)

void pci_aer_init(struct pci_dev *dev)

{

	dev->aer_cap = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	return pci_cleanup_aer_error_status_regs(dev);

	pci_cleanup_aer_error_status_regs(dev);

}



#define AER_AGENT_RECEIVER		0

include/linux/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -1468,13 +1468,9 @@ static inline bool pcie_aspm_support_enabled(void) { return false; } 
#endif



#ifdef CONFIG_PCIEAER

void pci_no_aer(void);

bool pci_aer_available(void);

int pci_aer_init(struct pci_dev *dev);

#else

static inline void pci_no_aer(void) { }

static inline bool pci_aer_available(void) { return false; }

static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }

#endif



#ifdef CONFIG_PCIE_ECRC