aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:33 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:33 -0400
commit7f4927c1b505eb4e679ab506bf7626af6258e6b6 (patch)
tree7686d23bf67956272967a79d7e3b23382ca17a3b /drivers
parentf45139044db870835b53a0fea41da2e04c3958d0 (diff)
[PATCH] fix u32 vs. pm_message_t in PCI, PCIE
This fixes drivers/pci (mostly pcie stuff). Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/hotplug/pciehp_core.c2
-rw-r--r--drivers/pci/pcie/portdrv.h2
-rw-r--r--drivers/pci/pcie/portdrv_bus.c4
-rw-r--r--drivers/pci/pcie/portdrv_core.c6
-rw-r--r--drivers/pci/pcie/portdrv_pci.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 8a5b2b51bde4..72baf749e65e 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -578,7 +578,7 @@ static void pciehp_remove (struct pcie_device *device)
578} 578}
579 579
580#ifdef CONFIG_PM 580#ifdef CONFIG_PM
581static int pciehp_suspend (struct pcie_device *dev, u32 state) 581static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
582{ 582{
583 printk("%s ENTRY\n", __FUNCTION__); 583 printk("%s ENTRY\n", __FUNCTION__);
584 return 0; 584 return 0;
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 6c3ad8918667..537b372dc340 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -31,7 +31,7 @@ extern struct bus_type pcie_port_bus_type;
31extern int pcie_port_device_probe(struct pci_dev *dev); 31extern int pcie_port_device_probe(struct pci_dev *dev);
32extern int pcie_port_device_register(struct pci_dev *dev); 32extern int pcie_port_device_register(struct pci_dev *dev);
33#ifdef CONFIG_PM 33#ifdef CONFIG_PM
34extern int pcie_port_device_suspend(struct pci_dev *dev, u32 state); 34extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
35extern int pcie_port_device_resume(struct pci_dev *dev); 35extern int pcie_port_device_resume(struct pci_dev *dev);
36#endif 36#endif
37extern void pcie_port_device_remove(struct pci_dev *dev); 37extern void pcie_port_device_remove(struct pci_dev *dev);
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c
index 9a02f28ed05f..4037a3e568de 100644
--- a/drivers/pci/pcie/portdrv_bus.c
+++ b/drivers/pci/pcie/portdrv_bus.c
@@ -15,7 +15,7 @@
15#include <linux/pcieport_if.h> 15#include <linux/pcieport_if.h>
16 16
17static int pcie_port_bus_match(struct device *dev, struct device_driver *drv); 17static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);
18static int pcie_port_bus_suspend(struct device *dev, u32 state); 18static int pcie_port_bus_suspend(struct device *dev, pm_message_t state);
19static int pcie_port_bus_resume(struct device *dev); 19static int pcie_port_bus_resume(struct device *dev);
20 20
21struct bus_type pcie_port_bus_type = { 21struct bus_type pcie_port_bus_type = {
@@ -46,7 +46,7 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
46 return 1; 46 return 1;
47} 47}
48 48
49static int pcie_port_bus_suspend(struct device *dev, u32 state) 49static int pcie_port_bus_suspend(struct device *dev, pm_message_t state)
50{ 50{
51 struct pcie_device *pciedev; 51 struct pcie_device *pciedev;
52 struct pcie_port_service_driver *driver; 52 struct pcie_port_service_driver *driver;
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 127f64f85dc5..576285765e98 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -61,7 +61,7 @@ static int pcie_port_remove_service(struct device *dev)
61 61
62static void pcie_port_shutdown_service(struct device *dev) {} 62static void pcie_port_shutdown_service(struct device *dev) {}
63 63
64static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level) 64static int pcie_port_suspend_service(struct device *dev, pm_message_t state, u32 level)
65{ 65{
66 struct pcie_device *pciedev; 66 struct pcie_device *pciedev;
67 struct pcie_port_service_driver *driver; 67 struct pcie_port_service_driver *driver;
@@ -76,7 +76,7 @@ static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level)
76 return 0; 76 return 0;
77} 77}
78 78
79static int pcie_port_resume_service(struct device *dev, u32 state) 79static int pcie_port_resume_service(struct device *dev, u32 level)
80{ 80{
81 struct pcie_device *pciedev; 81 struct pcie_device *pciedev;
82 struct pcie_port_service_driver *driver; 82 struct pcie_port_service_driver *driver;
@@ -317,7 +317,7 @@ int pcie_port_device_register(struct pci_dev *dev)
317} 317}
318 318
319#ifdef CONFIG_PM 319#ifdef CONFIG_PM
320int pcie_port_device_suspend(struct pci_dev *dev, u32 state) 320int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state)
321{ 321{
322 struct list_head *head, *tmp; 322 struct list_head *head, *tmp;
323 struct device *parent, *child; 323 struct device *parent, *child;
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 3184843c3649..e9095ee508e3 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -67,7 +67,7 @@ static void pcie_portdrv_remove (struct pci_dev *dev)
67} 67}
68 68
69#ifdef CONFIG_PM 69#ifdef CONFIG_PM
70static int pcie_portdrv_suspend (struct pci_dev *dev, u32 state) 70static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
71{ 71{
72 return pcie_port_device_suspend(dev, state); 72 return pcie_port_device_suspend(dev, state);
73} 73}