aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:24 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:24 -0400
commit4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (patch)
tree4836046f082166b604e43eb3c6009682007ba5fe /drivers/char
parent438510f6f079e94df294936b5bd8a7fd679cd1c9 (diff)
[PATCH] Fix u32 vs. pm_message_t in drivers/char
Here are fixes for drivers/char. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/efficeon-agp.c2
-rw-r--r--drivers/char/s3c2410-rtc.c2
-rw-r--r--drivers/char/sonypi.c2
-rw-r--r--drivers/char/tpm/tpm.c2
-rw-r--r--drivers/char/tpm/tpm.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index 52c0a097118c..2a87cecdc912 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -408,7 +408,7 @@ static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
408 agp_put_bridge(bridge); 408 agp_put_bridge(bridge);
409} 409}
410 410
411static int agp_efficeon_suspend(struct pci_dev *dev, u32 state) 411static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)
412{ 412{
413 return 0; 413 return 0;
414} 414}
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c
index ec666395a26c..8e61be34a1d3 100644
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
@@ -515,7 +515,7 @@ static struct timespec s3c2410_rtc_delta;
515 515
516static int ticnt_save; 516static int ticnt_save;
517 517
518static int s3c2410_rtc_suspend(struct device *dev, u32 state, u32 level) 518static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state, u32 level)
519{ 519{
520 struct rtc_time tm; 520 struct rtc_time tm;
521 struct timespec time; 521 struct timespec time;
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index f97a8a9751a0..c812191417c3 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1103,7 +1103,7 @@ static int sonypi_disable(void)
1103#ifdef CONFIG_PM 1103#ifdef CONFIG_PM
1104static int old_camera_power; 1104static int old_camera_power;
1105 1105
1106static int sonypi_suspend(struct device *dev, u32 state, u32 level) 1106static int sonypi_suspend(struct device *dev, pm_message_t state, u32 level)
1107{ 1107{
1108 if (level == SUSPEND_DISABLE) { 1108 if (level == SUSPEND_DISABLE) {
1109 old_camera_power = sonypi_device.camera_power; 1109 old_camera_power = sonypi_device.camera_power;
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 8318268169d6..ca36087d4f8a 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -567,7 +567,7 @@ static u8 savestate[] = {
567 * We are about to suspend. Save the TPM state 567 * We are about to suspend. Save the TPM state
568 * so that it can be restored. 568 * so that it can be restored.
569 */ 569 */
570int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state) 570int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
571{ 571{
572 struct tpm_chip *chip = pci_get_drvdata(pci_dev); 572 struct tpm_chip *chip = pci_get_drvdata(pci_dev);
573 if (chip == NULL) 573 if (chip == NULL)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 575cf5aed41a..de0c796fce80 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -89,5 +89,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
89 loff_t *); 89 loff_t *);
90extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); 90extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
91extern void __devexit tpm_remove(struct pci_dev *); 91extern void __devexit tpm_remove(struct pci_dev *);
92extern int tpm_pm_suspend(struct pci_dev *, u32); 92extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
93extern int tpm_pm_resume(struct pci_dev *); 93extern int tpm_pm_resume(struct pci_dev *);