[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 <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/sh/kernel/cpu/bus.c b/arch/sh/kernel/cpu/bus.c
index ace82f4b4a590290110df178b1b86524ffcb4277..d4fee2a7937306db8010a07e48d05c63ef697fad 100644 (file)
--- a/arch/sh/kernel/cpu/bus.c
+++ b/arch/sh/kernel/cpu/bus.c
@@ -31,7 +31,7 @@ static int sh_bus_match(struct device *dev, struct device_driver *drv)
        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);

diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 84fda21e4dbdf7154d39b81aa95634c59598a67d..3bc3bf1be49bd71bba7ba43e101f020dd0aed54b 100644 (file)
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -346,7 +346,7 @@ typedef struct sc1200_saved_state_s {
 } 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;
 

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index cea1e758eb469b9194787a2fa98c6184f888a57a..aefc0c1a862c4fb1ec53dbee056fdf711eb3b54e 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -3052,7 +3052,7 @@ pmu_polled_request(struct adb_request *req)
 
 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;

diff --git a/include/asm-sh/bus-sh.h b/include/asm-sh/bus-sh.h
index f782a33a98faf6eed9ed1f16e4252e437201ef83..83c5d2fd057fa8ac57a794c3d14a9f27da621d0f 100644 (file)
--- a/include/asm-sh/bus-sh.h
+++ b/include/asm-sh/bus-sh.h
@@ -34,7 +34,7 @@ struct sh_driver {
        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 *);
 };
 

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index f67686cef62aee1c1f5586e6e724d8d66aa22186..f90f674eb3b0ee48b6701941da6457a898530f5b 100644 (file)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -98,7 +98,7 @@ extern void mmc_free_host(struct mmc_host *);
 #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 *);

diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 8ce6b48f1881beb4369810e62af8439c100f138e..9e42a1a67ca469d2c9f319bb076b2dbd2401b3ea 100644 (file)
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -3640,7 +3640,7 @@ static int cs46xx_restart_part(struct cs_card *card)
 
 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,