Browse Source

PCI/AER: Move aer_irq() declaration to portdrv.h

The aer_irq() declaration is the only thing needed by aer_inject.c.  Move
it to portdrv.h so we eventually get rid of aerdrv.h completely.  No
functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Bjorn Helgaas 7 năm trước cách đây
mục cha
commit
f53e7418c3

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

@@ -21,7 +21,8 @@
 #include <linux/uaccess.h>
 #include <linux/uaccess.h>
 #include <linux/stddef.h>
 #include <linux/stddef.h>
 #include <linux/device.h>
 #include <linux/device.h>
-#include "aerdrv.h"
+
+#include "../portdrv.h"
 
 
 /* Override the existing corrected and uncorrected error masks */
 /* Override the existing corrected and uncorrected error masks */
 static bool aer_mask_override;
 static bool aer_mask_override;

+ 0 - 2
drivers/pci/pcie/aer/aerdrv.h

@@ -76,6 +76,4 @@ struct aer_rpc {
 					 */
 					 */
 };
 };
 
 
-irqreturn_t aer_irq(int irq, void *context);
-
 #endif /* _AERDRV_H_ */
 #endif /* _AERDRV_H_ */

+ 4 - 0
drivers/pci/pcie/portdrv.h

@@ -121,6 +121,10 @@ static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
 }
 }
 #endif
 #endif
 
 
+#ifdef CONFIG_PCIEAER
+irqreturn_t aer_irq(int irq, void *context);
+#endif
+
 struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,
 struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev,
 							u32 service);
 							u32 service);
 struct device *pcie_port_find_device(struct pci_dev *dev, u32 service);
 struct device *pcie_port_find_device(struct pci_dev *dev, u32 service);