tree 4ef18893a0f5618484a721a3851eeeb68a222eba
parent 7f4927c1b505eb4e679ab506bf7626af6258e6b6
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:34 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:34 -0700
[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]>
ppc64/kernel/of_device.c | 2 +-
asm-ppc/macio.h | 2 +-
asm-ppc/ocp.h | 2 +-
asm-ppc/of_device.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: arch/ppc64/kernel/of_device.c
===================================================================
--- 7686d23bf67956272967a79d7e3b23382ca17a3b/arch/ppc64/kernel/of_device.c
(mode:100644 sha1:b27a75f1b986e529934c40ab98279164ab94e08f)
+++ 4ef18893a0f5618484a721a3851eeeb68a222eba/arch/ppc64/kernel/of_device.c
(mode:100644 sha1:f4c825a69fa0ce700065f51ed48a71cfa5d5985b)
@@ -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
===================================================================
--- 7686d23bf67956272967a79d7e3b23382ca17a3b/include/asm-ppc/macio.h
(mode:100644 sha1:00605bb88b2a153c5016f8f0f037f620e26e5f83)
+++ 4ef18893a0f5618484a721a3851eeeb68a222eba/include/asm-ppc/macio.h
(mode:100644 sha1:2cafc9978607978116ed38849931c6e863f1ab4d)
@@ -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
===================================================================
--- 7686d23bf67956272967a79d7e3b23382ca17a3b/include/asm-ppc/ocp.h
(mode:100644 sha1:5ea44cabfaa4368c966c19e5506d68a9a0e95744)
+++ 4ef18893a0f5618484a721a3851eeeb68a222eba/include/asm-ppc/ocp.h
(mode:100644 sha1:b98db3cdae83c3505c51fa386ed526a3f8e3b1de)
@@ -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
===================================================================
--- 7686d23bf67956272967a79d7e3b23382ca17a3b/include/asm-ppc/of_device.h
(mode:100644 sha1:14441c629010c75eb0ec5aff89e0dd738b8af7b1)
+++ 4ef18893a0f5618484a721a3851eeeb68a222eba/include/asm-ppc/of_device.h
(mode:100644 sha1:7229735a7c1871c28c4950cc3279373cf74dca2d)
@@ -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
