dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Pavel Machek 2005-04-16 15:25:33 -07:00 committed by Linus Torvalds
parent f45139044d
commit 7f4927c1b5
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/hotplug/pciehp_core.c
View File

@ -578,7 +578,7 @@ static void pciehp_remove (struct pcie_device *device)
} }
#ifdef CONFIG_PM #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__); printk("%s ENTRY\n", __FUNCTION__);
return 0; return 0;

2
drivers/pci/pcie/portdrv.h
View File

@ -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_probe(struct pci_dev *dev);
extern int pcie_port_device_register(struct pci_dev *dev); extern int pcie_port_device_register(struct pci_dev *dev);
#ifdef CONFIG_PM #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); extern int pcie_port_device_resume(struct pci_dev *dev);
#endif #endif
extern void pcie_port_device_remove(struct pci_dev *dev); extern void pcie_port_device_remove(struct pci_dev *dev);

4
drivers/pci/pcie/portdrv_bus.c
View File

@ -15,7 +15,7 @@
#include <linux/pcieport_if.h> #include <linux/pcieport_if.h>
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv); 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); static int pcie_port_bus_resume(struct device *dev);
struct bus_type pcie_port_bus_type = { 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; 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_device *pciedev;
struct pcie_port_service_driver *driver; struct pcie_port_service_driver *driver;

6
drivers/pci/pcie/portdrv_core.c
View File

@ -61,7 +61,7 @@ static int pcie_port_remove_service(struct device *dev)
static void pcie_port_shutdown_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_device *pciedev;
struct pcie_port_service_driver *driver; 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; 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_device *pciedev;
struct pcie_port_service_driver *driver; struct pcie_port_service_driver *driver;
@ -317,7 +317,7 @@ int pcie_port_device_register(struct pci_dev *dev)
} }
#ifdef CONFIG_PM #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 list_head *head, *tmp;
struct device *parent, *child; struct device *parent, *child;

2
drivers/pci/pcie/portdrv_pci.c
View File

@ -67,7 +67,7 @@ static void pcie_portdrv_remove (struct pci_dev *dev)
} }
#ifdef CONFIG_PM #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); return pcie_port_device_suspend(dev, state);
} }

2
include/linux/pcieport_if.h
View File

@ -59,7 +59,7 @@ struct pcie_port_service_driver {
int (*probe) (struct pcie_device *dev, int (*probe) (struct pcie_device *dev,
const struct pcie_port_service_id *id); const struct pcie_port_service_id *id);
void (*remove) (struct pcie_device *dev); 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); int (*resume) (struct pcie_device *dev);
const struct pcie_port_service_id *id_table; const struct pcie_port_service_id *id_table;