aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie/portdrv_bus.c
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/pci/pcie/portdrv_bus.c
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/pci/pcie/portdrv_bus.c')
-rw-r--r--drivers/pci/pcie/portdrv_bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c
index 9a02f28ed05..4037a3e568d 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;