diff options
| author | Jisheng Zhang | 2019-04-12 08:43:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-25 18:23:37 +0200 |
| commit | 2e757498250209de256485bc03aa7f04eed910bd (patch) | |
| tree | 108589538a6ab708cc8106e970e2fd7b64ae151f /drivers/pci | |
| parent | PCI: Init PCIe feature bits for managed host bridge alloc (diff) | |
| download | kernel-qcow2-linux-2e757498250209de256485bc03aa7f04eed910bd.tar.gz kernel-qcow2-linux-2e757498250209de256485bc03aa7f04eed910bd.tar.xz kernel-qcow2-linux-2e757498250209de256485bc03aa7f04eed910bd.zip | |
PCI/AER: Change pci_aer_init() stub to return void
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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6e0d1528d471..ab25752f00d9 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -530,7 +530,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) { } |