tree 3a6385e981050dffd76c0dba0a9099c1ba817573
parent 053e1b2137ca655fea9c9207b810a7b6e8a025a7
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:53 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:53 2005
[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]>
agp/efficeon-agp.c | 2 +-
s3c2410-rtc.c | 2 +-
sonypi.c | 2 +-
tpm/tpm.c | 2 +-
tpm/tpm.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: drivers/char/agp/efficeon-agp.c
===================================================================
--- 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/char/agp/efficeon-agp.c
(mode:100644 sha1:36c10b5939d370acdee3ac6268d2b9dbf5501761)
+++ 3a6385e981050dffd76c0dba0a9099c1ba817573/drivers/char/agp/efficeon-agp.c
(mode:100644 sha1:6061466aa56d00066984a5e90d9e7f61aa6e2126)
@@ -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
===================================================================
--- 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/char/s3c2410-rtc.c
(mode:100644 sha1:e3b5c964df08ff35b60afebd06c19c5a254cf248)
+++ 3a6385e981050dffd76c0dba0a9099c1ba817573/drivers/char/s3c2410-rtc.c
(mode:100644 sha1:c841bf9959014ad102f5193b981fae09b9f785c4)
@@ -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
===================================================================
--- 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/char/sonypi.c
(mode:100644 sha1:0aafdd5244832d0b952551c28475d3f6b23e88e0)
+++ 3a6385e981050dffd76c0dba0a9099c1ba817573/drivers/char/sonypi.c
(mode:100644 sha1:f490386ae086974958334eacef74e977d3c4509d)
@@ -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
===================================================================
--- 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/char/tpm/tpm.c
(mode:100644 sha1:539cfd9b768d1f974434590e61ff7018d3224a2d)
+++ 3a6385e981050dffd76c0dba0a9099c1ba817573/drivers/char/tpm/tpm.c
(mode:100644 sha1:b2eaa80627edc148749be8e4abed64ef509f8f8e)
@@ -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
===================================================================
--- 9c136dc028fca2a140e8bbe6afb67b6a1f883635/drivers/char/tpm/tpm.h
(mode:100644 sha1:d422553a20c103b5f64689468088a2dce8a1e005)
+++ 3a6385e981050dffd76c0dba0a9099c1ba817573/drivers/char/tpm/tpm.h
(mode:100644 sha1:8031ed36f63b6b7c1d9f84416adfffc266818302)
@@ -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
