tree d3817e6480492e3714b4d87ae36e1846e0b88b4d
parent 3490cc075b95da89e9922b0f6aec7d3918d6629e
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:26:05 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:05 2005
[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]>
arch/sh/kernel/cpu/bus.c | 2 +-
drivers/ide/pci/sc1200.c | 2 +-
drivers/macintosh/via-pmu.c | 2 +-
include/asm-sh/bus-sh.h | 2 +-
include/linux/mmc/host.h | 2 +-
sound/oss/cs46xx.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
Index: arch/sh/kernel/cpu/bus.c
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/arch/sh/kernel/cpu/bus.c
(mode:100644 sha1:cc6f794360eeeae89691174b9c07ee32b8051880)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/arch/sh/kernel/cpu/bus.c
(mode:100644 sha1:04419233f3604e280f6787bcb1b4f127d4091269)
@@ -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
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/ide/pci/sc1200.c
(mode:100644 sha1:0f7b4a344894d8b7306062b504f096c723ad7fcb)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/drivers/ide/pci/sc1200.c
(mode:100644 sha1:1e0f80e0844c89dd3b94b50227c61359943bd2f8)
@@ -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
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/drivers/macintosh/via-pmu.c
(mode:100644 sha1:8c91a611d9256717a597599a23bcf60988b2fb8d)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/drivers/macintosh/via-pmu.c
(mode:100644 sha1:a681e484dbfa0a0bc5863742d51001295ce643e6)
@@ -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
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/include/asm-sh/bus-sh.h
(mode:100644 sha1:bb0897819cdbfb85f50f1f141c1f37cb84d3e50e)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/include/asm-sh/bus-sh.h
(mode:100644 sha1:2a24ba1bcf973c6bfb4da507128fbf69d29cb2e3)
@@ -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
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/include/linux/mmc/host.h
(mode:100644 sha1:168d38afbc12220396de0622a7ad1340c2303f84)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/include/linux/mmc/host.h
(mode:100644 sha1:dc1d0db866496878cb8aa5c268a343ccdb4bc5dd)
@@ -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
===================================================================
--- 7ff38dfd6025ea571b6b1e6a76aa8703c43d2841/sound/oss/cs46xx.c (mode:100644
sha1:231439317a72a223dd164b098b5b739e815e2d3c)
+++ d3817e6480492e3714b4d87ae36e1846e0b88b4d/sound/oss/cs46xx.c (mode:100644
sha1:bde31cb4ba6aa388333ed4997f3d9840eb17dab1)
@@ -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
