diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:33 -0700 |
| commit | 7f4927c1b505eb4e679ab506bf7626af6258e6b6 (patch) | |
| tree | 7686d23bf67956272967a79d7e3b23382ca17a3b /drivers/pci/pcie | |
| parent | f45139044db870835b53a0fea41da2e04c3958d0 (diff) | |
| download | blackbird-op-linux-7f4927c1b505eb4e679ab506bf7626af6258e6b6.tar.gz blackbird-op-linux-7f4927c1b505eb4e679ab506bf7626af6258e6b6.zip | |
[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')
| -rw-r--r-- | drivers/pci/pcie/portdrv.h | 2 | ||||
| -rw-r--r-- | drivers/pci/pcie/portdrv_bus.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pcie/portdrv_core.c | 6 | ||||
| -rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 2 |
4 files changed, 7 insertions, 7 deletions
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; 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); 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 @@ #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 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv) 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; 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) 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 @@ static int pcie_port_suspend_service(struct device *dev, u32 state, u32 level) 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 @@ int pcie_port_device_register(struct pci_dev *dev) } #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; 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) } #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); } |
