Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[safe/jmp/linux-2.6] / include / linux / pcieport_if.h

diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index 5d2afcf..6775532 100644 (file)
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -10,10 +10,7 @@
 #define _PCIEPORT_IF_H_
 
 /* Port Type */
-#define PCIE_RC_PORT                   4       /* Root port of RC */
-#define PCIE_SW_UPSTREAM_PORT          5       /* Upstream port of Switch */
-#define PCIE_SW_DOWNSTREAM_PORT                6       /* Downstream port of Switch */
-#define PCIE_ANY_PORT                  7
+#define PCIE_ANY_PORT                  (~0)
 
 /* Service Type */
 #define PCIE_PORT_SERVICE_PME_SHIFT    0       /* Power Management Event */
@@ -25,17 +22,6 @@
 #define PCIE_PORT_SERVICE_VC_SHIFT     3       /* Virtual Channel */
 #define PCIE_PORT_SERVICE_VC           (1 << PCIE_PORT_SERVICE_VC_SHIFT)
 
-/* Root/Upstream/Downstream Port's Interrupt Mode */
-#define PCIE_PORT_NO_IRQ               (-1)
-#define PCIE_PORT_INTx_MODE            0
-#define PCIE_PORT_MSI_MODE             1
-#define PCIE_PORT_MSIX_MODE            2
-
-struct pcie_port_data {
-       int port_type;          /* Type of the port */
-       int port_irq_mode;      /* [0:INTx | 1:MSI | 2:MSI-X] */
-};
-
 struct pcie_device {
        int             irq;        /* Service IRQ/MSI/MSI-X Vector */
        struct pci_dev *port;       /* Root/Upstream/Downstream Port */
@@ -59,7 +45,7 @@ struct pcie_port_service_driver {
        const char *name;
        int (*probe) (struct pcie_device *dev);
        void (*remove) (struct pcie_device *dev);
-       int (*suspend) (struct pcie_device *dev, pm_message_t state);
+       int (*suspend) (struct pcie_device *dev);
        int (*resume) (struct pcie_device *dev);
 
        /* Service Error Recovery Handler */