Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / pcieport_if.h

diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index cd3eafc2c23335976b915782c2e516cf8d1fa4e5..6cd91e3f982052df783c2ec9b9df130bff118659 100644 (file)
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -59,9 +59,15 @@ struct pcie_port_service_driver {
        int (*probe) (struct pcie_device *dev, 
                const struct pcie_port_service_id *id);
        void (*remove) (struct pcie_device *dev);
-       int (*suspend) (struct pcie_device *dev, u32 state);
+       int (*suspend) (struct pcie_device *dev, pm_message_t state);
        int (*resume) (struct pcie_device *dev);
 
+       /* Service Error Recovery Handler */
+       struct pci_error_handlers *err_handler;
+
+       /* Link Reset Capability - AER service driver specific */
+       pci_ers_result_t (*reset_link) (struct pci_dev *dev);
+
        const struct pcie_port_service_id *id_table;
        struct device_driver driver;
 };