diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:29 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:29 -0500 |
| commit | 156752817cb090643f7e20094d17dbd2c3f14f0d (patch) | |
| tree | 30bcf50ffcacdcfb4d8e10d9337b91c22b3ea7fc | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| parent | 31f996efbd5a7825f4d30150469e9d110aea00e8 (diff) | |
| download | linux-156752817cb090643f7e20094d17dbd2c3f14f0d.tar.gz linux-156752817cb090643f7e20094d17dbd2c3f14f0d.tar.bz2 linux-156752817cb090643f7e20094d17dbd2c3f14f0d.zip | |
Merge branch 'pci/aer'
- Fix pci_aer_init() stub prototype for non-CONFIG_PCIEAER case (Jisheng
Zhang)
* pci/aer:
PCI/AER: Change pci_aer_init() stub to return void
| -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 224d88634115..17c4ed2021de 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -596,7 +596,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) { } |