tree 482accb34d082f7460c8acc8db6e00331dbf3e29
parent 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:37 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:37 -0700
[PATCH] fix u32 vs. pm_message_t in rest of the tree
This fixes u32 vs. pm_message_t confusion in remaining places. Fortunately
there's few of them.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
sh/kernel/cpu/bus.c | 2 +-
ide/pci/sc1200.c | 2 +-
macintosh/via-pmu.c | 2 +-
asm-sh/bus-sh.h | 2 +-
linux/mmc/host.h | 2 +-
oss/cs46xx.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
Index: arch/sh/kernel/cpu/bus.c
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/arch/sh/kernel/cpu/bus.c
(mode:100644 sha1:ace82f4b4a590290110df178b1b86524ffcb4277)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/arch/sh/kernel/cpu/bus.c
(mode:100644 sha1:d4fee2a7937306db8010a07e48d05c63ef697fad)
@@ -31,7 +31,7 @@
return shdev->dev_id == shdrv->dev_id;
}
-static int sh_bus_suspend(struct device *dev, u32 state)
+static int sh_bus_suspend(struct device *dev, pm_message_t state)
{
struct sh_dev *shdev = to_sh_dev(dev);
struct sh_driver *shdrv = to_sh_driver(dev->driver);
Index: drivers/ide/pci/sc1200.c
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/ide/pci/sc1200.c
(mode:100644 sha1:84fda21e4dbdf7154d39b81aa95634c59598a67d)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/drivers/ide/pci/sc1200.c
(mode:100644 sha1:3bc3bf1be49bd71bba7ba43e101f020dd0aed54b)
@@ -346,7 +346,7 @@
} sc1200_saved_state_t;
-static int sc1200_suspend (struct pci_dev *dev, u32 state)
+static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
{
ide_hwif_t *hwif = NULL;
Index: drivers/macintosh/via-pmu.c
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/drivers/macintosh/via-pmu.c
(mode:100644 sha1:cea1e758eb469b9194787a2fa98c6184f888a57a)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/drivers/macintosh/via-pmu.c
(mode:100644 sha1:aefc0c1a862c4fb1ec53dbee056fdf711eb3b54e)
@@ -3052,7 +3052,7 @@
static int pmu_sys_suspended = 0;
-static int pmu_sys_suspend(struct sys_device *sysdev, u32 state)
+static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state)
{
if (state != PM_SUSPEND_DISK || pmu_sys_suspended)
return 0;
Index: include/asm-sh/bus-sh.h
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/include/asm-sh/bus-sh.h
(mode:100644 sha1:f782a33a98faf6eed9ed1f16e4252e437201ef83)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/include/asm-sh/bus-sh.h
(mode:100644 sha1:83c5d2fd057fa8ac57a794c3d14a9f27da621d0f)
@@ -34,7 +34,7 @@
unsigned int bus_id;
int (*probe)(struct sh_dev *);
int (*remove)(struct sh_dev *);
- int (*suspend)(struct sh_dev *, u32);
+ int (*suspend)(struct sh_dev *, pm_message_t);
int (*resume)(struct sh_dev *);
};
Index: include/linux/mmc/host.h
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/include/linux/mmc/host.h
(mode:100644 sha1:f67686cef62aee1c1f5586e6e724d8d66aa22186)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/include/linux/mmc/host.h
(mode:100644 sha1:f90f674eb3b0ee48b6701941da6457a898530f5b)
@@ -98,7 +98,7 @@
#define mmc_priv(x) ((void *)((x) + 1))
#define mmc_dev(x) ((x)->dev)
-extern int mmc_suspend_host(struct mmc_host *, u32);
+extern int mmc_suspend_host(struct mmc_host *, pm_message_t);
extern int mmc_resume_host(struct mmc_host *);
extern void mmc_detect_change(struct mmc_host *);
Index: sound/oss/cs46xx.c
===================================================================
--- 292b71ae99b8ad8d699237d6fc8b718636ef5f2d/sound/oss/cs46xx.c (mode:100644
sha1:8ce6b48f1881beb4369810e62af8439c100f138e)
+++ 482accb34d082f7460c8acc8db6e00331dbf3e29/sound/oss/cs46xx.c (mode:100644
sha1:9e42a1a67ca469d2c9f319bb076b2dbd2401b3ea)
@@ -3640,7 +3640,7 @@
static void cs461x_reset(struct cs_card *card);
static void cs461x_proc_stop(struct cs_card *card);
-static int cs46xx_suspend(struct cs_card *card, u32 state)
+static int cs46xx_suspend(struct cs_card *card, pm_message_t state)
{
unsigned int tmp;
CS_DBGOUT(CS_PM | CS_FUNCTION, 4,
-
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
