tree 7686d23bf67956272967a79d7e3b23382ca17a3b
parent f45139044db870835b53a0fea41da2e04c3958d0
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:33 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:33 -0700
[PATCH] fix u32 vs. pm_message_t in PCI, PCIE
This fixes drivers/pci (mostly pcie stuff).
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
pci/hotplug/pciehp_core.c | 2 +-
pci/pcie/portdrv.h | 2 +-
pci/pcie/portdrv_bus.c | 4 ++--
pci/pcie/portdrv_core.c | 6 +++---
pci/pcie/portdrv_pci.c | 2 +-
linux/pcieport_if.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
Index: drivers/pci/hotplug/pciehp_core.c
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/pci/hotplug/pciehp_core.c
(mode:100644 sha1:8a5b2b51bde4fe98fee7887352b2baecfb80618c)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/drivers/pci/hotplug/pciehp_core.c
(mode:100644 sha1:72baf749e65ef812d8e7f6ed69fba0b44cfc7d58)
@@ -578,7 +578,7 @@
}
#ifdef CONFIG_PM
-static int pciehp_suspend (struct pcie_device *dev, u32 state)
+static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
{
printk("%s ENTRY\n", __FUNCTION__);
return 0;
Index: drivers/pci/pcie/portdrv.h
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/pci/pcie/portdrv.h
(mode:100644 sha1:6c3ad891866757e6eee9700e882e8383661f54cb)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/drivers/pci/pcie/portdrv.h
(mode:100644 sha1:537b372dc3408868908ace74799c109207534a5d)
@@ -31,7 +31,7 @@
extern int pcie_port_device_probe(struct pci_dev *dev);
extern int pcie_port_device_register(struct pci_dev *dev);
#ifdef CONFIG_PM
-extern int pcie_port_device_suspend(struct pci_dev *dev, u32 state);
+extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
extern int pcie_port_device_resume(struct pci_dev *dev);
#endif
extern void pcie_port_device_remove(struct pci_dev *dev);
Index: drivers/pci/pcie/portdrv_bus.c
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/pci/pcie/portdrv_bus.c
(mode:100644 sha1:9a02f28ed05f5519ea6433bad4d9cde6edfd4670)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/drivers/pci/pcie/portdrv_bus.c
(mode:100644 sha1:4037a3e568de9d97043a946e6eb936f914de27cb)
@@ -15,7 +15,7 @@
#include <linux/pcieport_if.h>
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);
-static int pcie_port_bus_suspend(struct device *dev, u32 state);
+static int pcie_port_bus_suspend(struct device *dev, pm_message_t state);
static int pcie_port_bus_resume(struct device *dev);
struct bus_type pcie_port_bus_type = {
@@ -46,7 +46,7 @@
return 1;
}
-static int pcie_port_bus_suspend(struct device *dev, u32 state)
+static int pcie_port_bus_suspend(struct device *dev, pm_message_t state)
{
struct pcie_device *pciedev;
struct pcie_port_service_driver *driver;
Index: drivers/pci/pcie/portdrv_core.c
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/pci/pcie/portdrv_core.c
(mode:100644 sha1:127f64f85dc5c44dc4c947fc88b8b22e4a28303b)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/drivers/pci/pcie/portdrv_core.c
(mode:100644 sha1:576285765e98cab75dab2fcc2d0ffbc1d9ff7897)
@@ -61,7 +61,7 @@
static void pcie_port_shutdown_service(struct device *dev) {}
-static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level)
+static int pcie_port_suspend_service(struct device *dev, pm_message_t state,
u32 level)
{
struct pcie_device *pciedev;
struct pcie_port_service_driver *driver;
@@ -76,7 +76,7 @@
return 0;
}
-static int pcie_port_resume_service(struct device *dev, u32 state)
+static int pcie_port_resume_service(struct device *dev, u32 level)
{
struct pcie_device *pciedev;
struct pcie_port_service_driver *driver;
@@ -317,7 +317,7 @@
}
#ifdef CONFIG_PM
-int pcie_port_device_suspend(struct pci_dev *dev, u32 state)
+int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)
{
struct list_head *head, *tmp;
struct device *parent, *child;
Index: drivers/pci/pcie/portdrv_pci.c
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/drivers/pci/pcie/portdrv_pci.c
(mode:100644 sha1:3184843c36490549464b16802714d05a487032d5)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/drivers/pci/pcie/portdrv_pci.c
(mode:100644 sha1:e9095ee508e348ec0a2e24572805010c83a61bb0)
@@ -67,7 +67,7 @@
}
#ifdef CONFIG_PM
-static int pcie_portdrv_suspend (struct pci_dev *dev, u32 state)
+static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
{
return pcie_port_device_suspend(dev, state);
}
Index: include/linux/pcieport_if.h
===================================================================
--- 9d6a935441e9414244c17e2bef35c3b6934e9355/include/linux/pcieport_if.h
(mode:100644 sha1:cd3eafc2c23335976b915782c2e516cf8d1fa4e5)
+++ 7686d23bf67956272967a79d7e3b23382ca17a3b/include/linux/pcieport_if.h
(mode:100644 sha1:b44e01a70914a81cccabfdbc4ad4c4df1e3a5afc)
@@ -59,7 +59,7 @@
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);
const struct pcie_port_service_id *id_table;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
