Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 17:23:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] Fix u32 vs. pm_message_t in drivers/char

Browse Source 
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>
This commit is contained in:
Pavel Machek 2005-04-16 15:25:24 -07:00 committed by Linus Torvalds
parent 438510f6f0
commit 4fd416c14c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/agp/efficeon-agp.c
View File

@ -408,7 +408,7 @@ static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
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;
}

2
drivers/char/s3c2410-rtc.c
View File

@ -515,7 +515,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;

2
drivers/char/sonypi.c
View File

@ -1103,7 +1103,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;

2
drivers/char/tpm/tpm.c
View File

@ -567,7 +567,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)

2
drivers/char/tpm/tpm.h
View File

@ -89,5 +89,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
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 *);