Commit 15675281 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 9e98c678 31f996ef

drivers/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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) { }