UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] u32 vs. pm_message_t in ppc and radeon 

This fixes pm_message_t vs.  u32 confusion in ppc and aty (I *hope* that's
basically radeon code...).  I was not able to test most of these, but I'm
not really changing anything, so it should be okay.

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:34 -07:00 committed by Linus Torvalds
parent 7f4927c1b5
commit b1c42851b0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ppc64/kernel/of_device.c
View File

@ -104,7 +104,7 @@ static int of_device_remove(struct device *dev)
return 0; return 0;
} }
static int of_device_suspend(struct device *dev, u32 state) static int of_device_suspend(struct device *dev, pm_message_t state)
{ {
struct of_device * of_dev = to_of_device(dev); struct of_device * of_dev = to_of_device(dev);
struct of_platform_driver * drv = to_of_platform_driver(dev->driver); struct of_platform_driver * drv = to_of_platform_driver(dev->driver);

2
include/asm-ppc/macio.h
View File

@ -126,7 +126,7 @@ struct macio_driver
int (*probe)(struct macio_dev* dev, const struct of_match *match); int (*probe)(struct macio_dev* dev, const struct of_match *match);
int (*remove)(struct macio_dev* dev); int (*remove)(struct macio_dev* dev);
int (*suspend)(struct macio_dev* dev, u32 state); int (*suspend)(struct macio_dev* dev, pm_message_t state);
int (*resume)(struct macio_dev* dev); int (*resume)(struct macio_dev* dev);
int (*shutdown)(struct macio_dev* dev); int (*shutdown)(struct macio_dev* dev);

2
include/asm-ppc/ocp.h
View File

@ -119,7 +119,7 @@ struct ocp_driver {
const struct ocp_device_id *id_table; /* NULL if wants all devices */ const struct ocp_device_id *id_table; /* NULL if wants all devices */
int (*probe) (struct ocp_device *dev); /* New device inserted */ int (*probe) (struct ocp_device *dev); /* New device inserted */
void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */ void (*remove) (struct ocp_device *dev); /* Device removed (NULL if not a hot-plug capable driver) */
int (*suspend) (struct ocp_device *dev, u32 state); /* Device suspended */ int (*suspend) (struct ocp_device *dev, pm_message_t state); /* Device suspended */
int (*resume) (struct ocp_device *dev); /* Device woken up */ int (*resume) (struct ocp_device *dev); /* Device woken up */
struct device_driver driver; struct device_driver driver;
}; };

2
include/asm-ppc/of_device.h
View File

@ -55,7 +55,7 @@ struct of_platform_driver
int (*probe)(struct of_device* dev, const struct of_match *match); int (*probe)(struct of_device* dev, const struct of_match *match);
int (*remove)(struct of_device* dev); int (*remove)(struct of_device* dev);
int (*suspend)(struct of_device* dev, u32 state); int (*suspend)(struct of_device* dev, pm_message_t state);
int (*resume)(struct of_device* dev); int (*resume)(struct of_device* dev);
int (*shutdown)(struct of_device* dev); int (*shutdown)(struct of_device* dev);