| Message ID | 20190412143458.2120118b@xhacker.debian (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 31f996efbd5a7825f4d30150469e9d110aea00e8 |
| Headers | show |
| Series | PCI: Make pci_aer_init() when !CONFIG_PCIEAER void too | expand |
On Fri, Apr 12, 2019 at 06:43:06AM +0000, Jisheng Zhang wrote: > 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. > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Added a stable tag and applied to pci/aer for v5.2, thanks! > --- > drivers/pci/pci.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index d994839a3e24..9cb99380c61e 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -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) { } > -- > 2.20.1 >
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index d994839a3e24..9cb99380c61e 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -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) { }
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. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- drivers/pci/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)