tree b7c532aa8d039014e13960972033ef92ab51f087
parent 56a8ce7ec8987034f6c630c4c9641659ac23b4e2
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:01 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:01 2005
[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]>
drivers/pci/hotplug/pciehp_core.c | 2 +-
drivers/pci/pcie/portdrv.h | 2 +-
drivers/pci/pcie/portdrv_bus.c | 4 ++--
drivers/pci/pcie/portdrv_core.c | 6 +++---
drivers/pci/pcie/portdrv_pci.c | 2 +-
include/linux/pcieport_if.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
Index: drivers/pci/hotplug/pciehp_core.c
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/pci/hotplug/pciehp_core.c
(mode:100644 sha1:961db4d9989e7e910d6ddbcbbbf85f4499e3b631)
+++ b7c532aa8d039014e13960972033ef92ab51f087/drivers/pci/hotplug/pciehp_core.c
(mode:100644 sha1:a33f7b9499fb9d7f1ae8f0897974b72f8fb2d66a)
@@ -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
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/pci/pcie/portdrv.h
(mode:100644 sha1:a5d80afca504d42b0426c2dcd37c334894a42ee4)
+++ b7c532aa8d039014e13960972033ef92ab51f087/drivers/pci/pcie/portdrv.h
(mode:100644 sha1:4d78aace24fb63d4d621bbc48e4cdc1c828458c3)
@@ -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
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/pci/pcie/portdrv_bus.c
(mode:100644 sha1:97a018bcd3032eb526332ba7aa95007412a463ae)
+++ b7c532aa8d039014e13960972033ef92ab51f087/drivers/pci/pcie/portdrv_bus.c
(mode:100644 sha1:d0c71640cc86ea8e58190a9233155d4cf93159f7)
@@ -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
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/pci/pcie/portdrv_core.c
(mode:100644 sha1:ad2690f1be4632cc75bf30d8a0b4c1a62309dd05)
+++ b7c532aa8d039014e13960972033ef92ab51f087/drivers/pci/pcie/portdrv_core.c
(mode:100644 sha1:dd62c67c76e22f4540ac893729e238c0cb2fd941)
@@ -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
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/drivers/pci/pcie/portdrv_pci.c
(mode:100644 sha1:c595e5372ed100ee65db8539d9c50fc09c536b98)
+++ b7c532aa8d039014e13960972033ef92ab51f087/drivers/pci/pcie/portdrv_pci.c
(mode:100644 sha1:dabb045ef018f72430ad271b17566a86870afe7a)
@@ -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
===================================================================
--- 34fadcf675b19a447ea116c5e5f6a46872cc83c9/include/linux/pcieport_if.h
(mode:100644 sha1:995fe8f01f7576623b130c3fd3b431c617bb1603)
+++ b7c532aa8d039014e13960972033ef92ab51f087/include/linux/pcieport_if.h
(mode:100644 sha1:41fc09ee9d51b5b1999a978189a462cda623d896)
@@ -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
