diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:34 -0700 |
| commit | b1c42851b006398dda77a068275e8741e33761f1 (patch) | |
| tree | 4ef18893a0f5618484a721a3851eeeb68a222eba | |
| parent | 7f4927c1b505eb4e679ab506bf7626af6258e6b6 (diff) | |
| download | blackbird-op-linux-b1c42851b006398dda77a068275e8741e33761f1.tar.gz blackbird-op-linux-b1c42851b006398dda77a068275e8741e33761f1.zip | |
[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>
| -rw-r--r-- | arch/ppc64/kernel/of_device.c | 2 | ||||
| -rw-r--r-- | include/asm-ppc/macio.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/ocp.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/of_device.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/of_device.c b/arch/ppc64/kernel/of_device.c index b27a75f1b986..f4c825a69fa0 100644 --- a/arch/ppc64/kernel/of_device.c +++ b/arch/ppc64/kernel/of_device.c @@ -104,7 +104,7 @@ static int of_device_remove(struct device *dev) 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); diff --git a/include/asm-ppc/macio.h b/include/asm-ppc/macio.h index 00605bb88b2a..2cafc9978607 100644 --- a/include/asm-ppc/macio.h +++ b/include/asm-ppc/macio.h @@ -126,7 +126,7 @@ struct macio_driver 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); diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 5ea44cabfaa4..b98db3cdae83 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h @@ -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; }; diff --git a/include/asm-ppc/of_device.h b/include/asm-ppc/of_device.h index 14441c629010..7229735a7c18 100644 --- a/include/asm-ppc/of_device.h +++ b/include/asm-ppc/of_device.h @@ -55,7 +55,7 @@ struct of_platform_driver 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); |
