tree 57cbe0389baf021d7e6c08f5cdaf885bedc1c3d4
parent 6cdcd7e6cadd7504ceeadcfb2af13f9b3b3a0b36
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:02 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:02 2005
[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
arch/ppc64/kernel/of_device.c | 2 +-
include/asm-ppc/macio.h | 2 +-
include/asm-ppc/ocp.h | 2 +-
include/asm-ppc/of_device.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: arch/ppc64/kernel/of_device.c
===================================================================
--- b7c532aa8d039014e13960972033ef92ab51f087/arch/ppc64/kernel/of_device.c
(mode:100644 sha1:32f9b05f7ff29655300555a0d44e4e7c35842c7d)
+++ 57cbe0389baf021d7e6c08f5cdaf885bedc1c3d4/arch/ppc64/kernel/of_device.c
(mode:100644 sha1:3b101a5680427ed230a7457ed2e2b6002401471a)
@@ -104,7 +104,7 @@
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_platform_driver * drv = to_of_platform_driver(dev->driver);
Index: include/asm-ppc/macio.h
===================================================================
--- b7c532aa8d039014e13960972033ef92ab51f087/include/asm-ppc/macio.h
(mode:100644 sha1:6607009b64c336b66147bf11afb4178cbe972b84)
+++ 57cbe0389baf021d7e6c08f5cdaf885bedc1c3d4/include/asm-ppc/macio.h
(mode:100644 sha1:5545d383ca042b12019295e25a7b7d6840730120)
@@ -126,7 +126,7 @@
int (*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);
Index: include/asm-ppc/ocp.h
===================================================================
--- b7c532aa8d039014e13960972033ef92ab51f087/include/asm-ppc/ocp.h
(mode:100644 sha1:0581daeff8bb914af2c074c7b80b6cd4cfb85d23)
+++ 57cbe0389baf021d7e6c08f5cdaf885bedc1c3d4/include/asm-ppc/ocp.h
(mode:100644 sha1:ce3e8e9d44cbbb94461232be290decd50bb933bc)
@@ -119,7 +119,7 @@
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;
};
Index: include/asm-ppc/of_device.h
===================================================================
--- b7c532aa8d039014e13960972033ef92ab51f087/include/asm-ppc/of_device.h
(mode:100644 sha1:b5bee0f953a588283600fb93474530d1e116b9b2)
+++ 57cbe0389baf021d7e6c08f5cdaf885bedc1c3d4/include/asm-ppc/of_device.h
(mode:100644 sha1:50e87fb9b7b4751c7011ca953bfb15d7a06b11e9)
@@ -55,7 +55,7 @@
int (*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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
