tree 4836046f082166b604e43eb3c6009682007ba5fe
parent 438510f6f079e94df294936b5bd8a7fd679cd1c9
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:24 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:24 -0700
[PATCH] Fix u32 vs. pm_message_t in drivers/char
Here are fixes for drivers/char.
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
char/agp/efficeon-agp.c | 2 +-
char/s3c2410-rtc.c | 2 +-
char/sonypi.c | 2 +-
char/tpm/tpm.c | 2 +-
char/tpm/tpm.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: drivers/char/agp/efficeon-agp.c
===================================================================
--- 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df/drivers/char/agp/efficeon-agp.c
(mode:100644 sha1:52c0a097118cda2458f734bde7cc54a86389fdff)
+++ 4836046f082166b604e43eb3c6009682007ba5fe/drivers/char/agp/efficeon-agp.c
(mode:100644 sha1:2a87cecdc912b8a7c75398f366a7fca68e9de984)
@@ -408,7 +408,7 @@
agp_put_bridge(bridge);
}
-static int agp_efficeon_suspend(struct pci_dev *dev, u32 state)
+static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)
{
return 0;
}
Index: drivers/char/s3c2410-rtc.c
===================================================================
--- 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df/drivers/char/s3c2410-rtc.c
(mode:100644 sha1:ec666395a26cb33009fb75aa1cc68c10f5173a58)
+++ 4836046f082166b604e43eb3c6009682007ba5fe/drivers/char/s3c2410-rtc.c
(mode:100644 sha1:8e61be34a1d328c5a948a646504ad65629eaef62)
@@ -515,7 +515,7 @@
static int ticnt_save;
-static int s3c2410_rtc_suspend(struct device *dev, u32 state, u32 level)
+static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state, u32
level)
{
struct rtc_time tm;
struct timespec time;
Index: drivers/char/sonypi.c
===================================================================
--- 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df/drivers/char/sonypi.c
(mode:100644 sha1:f97a8a9751a0d2da245e023013f3813a8966f72d)
+++ 4836046f082166b604e43eb3c6009682007ba5fe/drivers/char/sonypi.c
(mode:100644 sha1:c812191417c36aac6190f7e94e997ca7f6c3beac)
@@ -1103,7 +1103,7 @@
#ifdef CONFIG_PM
static int old_camera_power;
-static int sonypi_suspend(struct device *dev, u32 state, u32 level)
+static int sonypi_suspend(struct device *dev, pm_message_t state, u32 level)
{
if (level == SUSPEND_DISABLE) {
old_camera_power = sonypi_device.camera_power;
Index: drivers/char/tpm/tpm.c
===================================================================
--- 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df/drivers/char/tpm/tpm.c
(mode:100644 sha1:8318268169d67acbe2c39e4fdfee8881203a5031)
+++ 4836046f082166b604e43eb3c6009682007ba5fe/drivers/char/tpm/tpm.c
(mode:100644 sha1:ca36087d4f8a739774c51a39d7485cb4046c4082)
@@ -567,7 +567,7 @@
* We are about to suspend. Save the TPM state
* so that it can be restored.
*/
-int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state)
+int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
{
struct tpm_chip *chip = pci_get_drvdata(pci_dev);
if (chip == NULL)
Index: drivers/char/tpm/tpm.h
===================================================================
--- 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df/drivers/char/tpm/tpm.h
(mode:100644 sha1:575cf5aed41a572286bbc96f942356c72567edac)
+++ 4836046f082166b604e43eb3c6009682007ba5fe/drivers/char/tpm/tpm.h
(mode:100644 sha1:de0c796fce8000004b9d0d1eabc9b08cd875a16b)
@@ -89,5 +89,5 @@
loff_t *);
extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
extern void __devexit tpm_remove(struct pci_dev *);
-extern int tpm_pm_suspend(struct pci_dev *, u32);
+extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
extern int tpm_pm_resume(struct pci_dev *);
-
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
