diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:37 -0700 |
| commit | 3bfffd97ef913045080861d1898286ac8975c22a (patch) | |
| tree | 482accb34d082f7460c8acc8db6e00331dbf3e29 | |
| parent | 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (diff) | |
| download | linux-3bfffd97ef913045080861d1898286ac8975c22a.tar.gz linux-3bfffd97ef913045080861d1898286ac8975c22a.tar.bz2 linux-3bfffd97ef913045080861d1898286ac8975c22a.zip | |
[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>
| -rw-r--r-- | arch/sh/kernel/cpu/bus.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pci/sc1200.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 | ||||
| -rw-r--r-- | include/asm-sh/bus-sh.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/host.h | 2 | ||||
| -rw-r--r-- | sound/oss/cs46xx.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/bus.c b/arch/sh/kernel/cpu/bus.c index ace82f4b4a59..d4fee2a79373 100644 --- 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 84fda21e4dbd..3bc3bf1be49b 100644 --- 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 cea1e758eb46..aefc0c1a862c 100644 --- 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 f782a33a98fa..83c5d2fd057f 100644 --- 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 f67686cef62a..f90f674eb3b0 100644 --- 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 8ce6b48f1881..9e42a1a67ca4 100644 --- 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, |