releases/5.0.19/pci-aer-change-pci_aer_init-stub-to-return-void.patch

   1 From 31f996efbd5a7825f4d30150469e9d110aea00e8 Mon Sep 17 00:00:00 2001
   2 From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
   3 Date: Fri, 12 Apr 2019 06:43:06 +0000
   4 Subject: PCI/AER: Change pci_aer_init() stub to return void
   5
   6 From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
   7
   8 commit 31f996efbd5a7825f4d30150469e9d110aea00e8 upstream.
   9
  10 Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to
  11 drivers/pci/pci.h") changed pci_aer_init() to return "void", but didn't
  12 change the stub for when CONFIG_PCIEAER isn't enabled.  Change the stub to
  13 match.
  14
  15 Fixes: 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h")
  16 Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
  17 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  18 CC: stable@vger.kernel.org      # v4.19+
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/pci/pci.h |    2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 --- a/drivers/pci/pci.h
  26 +++ b/drivers/pci/pci.h
  27 @@ -596,7 +596,7 @@ void pci_aer_clear_fatal_status(struct p
  28  void pci_aer_clear_device_status(struct pci_dev *dev);
  29  #else
  30  static inline void pci_no_aer(void) { }
  31 -static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; }
  32 +static inline void pci_aer_init(struct pci_dev *d) { }
  33  static inline void pci_aer_exit(struct pci_dev *d) { }
  34  static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { }
  35  static inline void pci_aer_clear_device_status(struct pci_dev *dev) { }