| From 31f996efbd5a7825f4d30150469e9d110aea00e8 Mon Sep 17 00:00:00 2001 |
| From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| Date: Fri, 12 Apr 2019 06:43:06 +0000 |
| Subject: PCI/AER: Change pci_aer_init() stub to return void |
| |
| From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| |
| commit 31f996efbd5a7825f4d30150469e9d110aea00e8 upstream. |
| |
| Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to |
| drivers/pci/pci.h") changed pci_aer_init() to return "void", but didn't |
| change the stub for when CONFIG_PCIEAER isn't enabled. Change the stub to |
| match. |
| |
| Fixes: 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h") |
| Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| CC: stable@vger.kernel.org # v4.19+ |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/pci.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pci/pci.h |
| +++ b/drivers/pci/pci.h |
| @@ -530,7 +530,7 @@ void pci_aer_clear_fatal_status(struct p |
| 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) { } |
