u32 vs. pm_message_t in ppc and radeon
PATCH 116/198 u32 vs. pm_message_t in ppc and radeon
From: Pavel Machek <[email protected]>
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 <[email protected]>
---
25-akpm/arch/ppc64/kernel/of_device.c | 2 +- 25-akpm/include/asm-ppc/macio.h | 2 +- 25-akpm/include/asm-ppc/ocp.h | 2 +- 25-akpm/include/asm-ppc/of_device.h | 2 +- drivers/video/aty/aty128fb.c | 0 drivers/video/aty/atyfb_base.c | 0 drivers/video/aty/radeonfb.h | 0 7 files changed, 4 insertions(+), 4 deletions(-)
arch/ppc64/kernel/of_device.c renamed from arch/ppc64/kernel/of_device.c~u32-vs-pm_message_t-in-ppc-and-radeon +1 -1
@@ -104,7 +104,7 @@ static int of_device_remove(struct devicreturn 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_platform_driver * drv =to_of_platform_driver (dev->driver);
diff -puN drivers/video/aty/aty128fb.c~u32-vs-pm_message_t-in-ppc-and-radeon drivers/video/aty/aty128fb.c diff -puN drivers/video/aty/atyfb_base.c~u32-vs-pm_message_t-in-ppc-and-radeon drivers/video/aty/atyfb_base.c diff -puN drivers/video/aty/radeonfb.h~u32-vs-pm_message_t-in-ppc-and-radeon drivers/video/aty/radeonfb.h
include/asm-ppc/macio.h renamed from include/asm-ppc/macio.h~u32-vs-pm_message_t-in-ppc-and-radeon +1 -1
@@ -126,7 +126,7 @@ struct macio_driverint (*probe)(struct macio_dev * dev,const struct of_match *match);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 (*shutdown)(struct macio_dev * dev);
include/asm-ppc/ocp.h renamed from include/asm-ppc/ocp.h~u32-vs-pm_message_t-in-ppc-and-radeon +1 -1
@@ -119,7 +119,7 @@ struct ocp_driver {const struct ocp_device_id *id_table;/* NULL if wants all devices */ 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) */ -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 */ struct device_driver driver; };
include/asm-ppc/of_device.h renamed from include/asm-ppc/of_device.h~u32-vs-pm_message_t-in-ppc-and-radeon +1 -1
@@ -55,7 +55,7 @@ struct of_platform_driverint (*probe)(struct of_device * dev,const struct of_match *match);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 (*shutdown)(struct of_device * dev);
_