[-mm PATCH] driver model: PM type conversions in drivers/char

[-mm PATCH] driver model: PM type conversions in drivers/char

[Daniel Drake]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

This fixes PM driver model type checking for drivers/char.
Acked by Pavel Machek.

Signed-off-by: Daniel Drake <dsd@gentoo.org>

[-- Attachment #2: char-pm-type-safety.patch --]
[-- Type: text/x-patch, Size: 2894 bytes --]

diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/char/agp/efficeon-agp.c linux-dsd/drivers/char/agp/efficeon-agp.c
--- linux-2.6.11-rc2-mm2/drivers/char/agp/efficeon-agp.c	2005-02-02 21:55:19.000000000 +0000
+++ linux-dsd/drivers/char/agp/efficeon-agp.c	2005-02-02 21:45:01.000000000 +0000
@@ -408,7 +408,7 @@ static void __devexit agp_efficeon_remov
 	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;
 }
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/char/s3c2410-rtc.c linux-dsd/drivers/char/s3c2410-rtc.c
--- linux-2.6.11-rc2-mm2/drivers/char/s3c2410-rtc.c	2005-02-02 21:54:16.000000000 +0000
+++ linux-dsd/drivers/char/s3c2410-rtc.c	2005-02-02 21:44:26.000000000 +0000
@@ -514,7 +514,7 @@ static struct timespec s3c2410_rtc_delta
 
 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;
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/char/sonypi.c linux-dsd/drivers/char/sonypi.c
--- linux-2.6.11-rc2-mm2/drivers/char/sonypi.c	2005-02-02 21:54:16.000000000 +0000
+++ linux-dsd/drivers/char/sonypi.c	2005-02-02 21:44:45.000000000 +0000
@@ -693,7 +693,7 @@ static int sonypi_disable(void)
 #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;
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/char/tpm/tpm.c linux-dsd/drivers/char/tpm/tpm.c
--- linux-2.6.11-rc2-mm2/drivers/char/tpm/tpm.c	2005-02-02 21:55:20.000000000 +0000
+++ linux-dsd/drivers/char/tpm/tpm.c	2005-02-02 21:45:18.000000000 +0000
@@ -564,7 +564,7 @@ static u8 savestate[] = {
  * 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)
diff -urNpX dontdiff linux-2.6.11-rc2-mm2/drivers/char/tpm/tpm.h linux-dsd/drivers/char/tpm/tpm.h
--- linux-2.6.11-rc2-mm2/drivers/char/tpm/tpm.h	2005-02-02 21:55:20.000000000 +0000
+++ linux-dsd/drivers/char/tpm/tpm.h	2005-02-02 21:45:52.000000000 +0000
@@ -88,5 +88,5 @@ extern ssize_t tpm_write(struct file *, 
 			 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 *);