Skip to contentSkip to conversation

PCI: Make pci_aer_init() when !CONFIG_PCIEAER void too

PATCH In review Jisheng Zhang 2 participants 2 messages Apr 12, 2019 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Make pci_aer_init() when !CONFIG_PCIEAER void too

Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h") makes pci_aer_init() void, but the version when !CONFIG_PCIEAER isn't modified accordingly, fix it.

---
 drivers/pci/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.h +1 -1
index d994839a3e24..9cb99380c61e 100644
@@ -597,7 +597,7 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev);
 void pci_aer_clear_device_status(struct pci_dev *dev);
 #else
 static inline void pci_no_aer(void) { }
-static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }
+static inline void pci_aer_init(struct pci_dev *d) { }
 static inline void pci_aer_exit(struct pci_dev *d) { }
 static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }
 static inline void pci_aer_clear_device_status(struct pci_dev *dev) { }
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Jisheng Zhang

Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h") makes pci_aer_init() void, but the version when !CONFIG_PCIEAER isn't modified accordingly, fix it.

Added a stable tag and applied to pci/aer for v5.2, thanks!

Quoted 20 lines
---
 drivers/pci/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.h +1 -1
index d994839a3e24..9cb99380c61e 100644
@@ -597,7 +597,7 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev);
 void pci_aer_clear_device_status(struct pci_dev *dev);
 #else
 static inline void pci_no_aer(void) { }
-static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }
+static inline void pci_aer_init(struct pci_dev *d) { }
 static inline void pci_aer_exit(struct pci_dev *d) { }
 static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }
 static inline void pci_aer_clear_device_status(struct pci_dev *dev) { }
Signature · 1 line
2.20.1