浏览代码

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: Rajat Jain <rajatja@google.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Rajat Jain 7 年之前
父节点
当前提交
60ed982a4e
共有 3 个文件被更改,包括 10 次插入6 次删除
  1. 8 0
      drivers/pci/pci.h
  2. 2 2
      drivers/pci/pcie/aer.c
  3. 0 4
      include/linux/pci.h

+ 8 - 0
drivers/pci/pci.h

@@ -480,4 +480,12 @@ static inline int devm_of_pci_get_host_bridge_resources(struct device *dev,
 }
 }
 #endif
 #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 */
 #endif /* DRIVERS_PCI_H */

+ 2 - 2
drivers/pci/pcie/aer.c

@@ -382,10 +382,10 @@ int pci_cleanup_aer_error_status_regs(struct pci_dev *dev)
 	return 0;
 	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);
 	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
 #define AER_AGENT_RECEIVER		0

+ 0 - 4
include/linux/pci.h

@@ -1468,13 +1468,9 @@ static inline bool pcie_aspm_support_enabled(void) { return false; }
 #endif
 #endif
 
 
 #ifdef CONFIG_PCIEAER
 #ifdef CONFIG_PCIEAER
-void pci_no_aer(void);
 bool pci_aer_available(void);
 bool pci_aer_available(void);
-int pci_aer_init(struct pci_dev *dev);
 #else
 #else
-static inline void pci_no_aer(void) { }
 static inline bool pci_aer_available(void) { return false; }
 static inline bool pci_aer_available(void) { return false; }
-static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }
 #endif
 #endif
 
 
 #ifdef CONFIG_PCIE_ECRC
 #ifdef CONFIG_PCIE_ECRC