diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:12 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 21:24:12 +0300 |
| commit | f19013248ea2cd79ff73be982396d950e3870d25 (patch) | |
| tree | fb6249a323a8c0f35f495a9df8a51fd5ca8d33a8 /include/linux | |
| parent | 3a749ea1c0271cbadf234befe307f14267325836 (diff) | |
| parent | 8fc614c0ae5cb5df11d6aa9559e63baacf20a840 (diff) | |
| download | linux-f19013248ea2cd79ff73be982396d950e3870d25.tar.xz | |
Merge branch 'pci/aer' into next
* pci/aer:
PCI/AER: Reformat AER register definitions
PCI/portdrv: Move error handler methods to struct pcie_port_service_driver
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pcieport_if.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h index afcd130ab3a9..18edc651c070 100644 --- a/include/linux/pcieport_if.h +++ b/include/linux/pcieport_if.h @@ -50,8 +50,8 @@ struct pcie_port_service_driver { int (*suspend) (struct pcie_device *dev); int (*resume) (struct pcie_device *dev); - /* Service Error Recovery Handler */ - const struct pci_error_handlers *err_handler; + /* Device driver may resume normal operations */ + void (*error_resume)(struct pci_dev *dev); /* Link Reset Capability - AER service driver specific */ pci_ers_result_t (*reset_link) (struct pci_dev *dev); |