[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>
This commit is contained in:
Родитель
438510f6f0
Коммит
4fd416c14c
|
@ -408,7 +408,7 @@ static void __devexit agp_efficeon_remove(struct pci_dev *pdev)
|
||||||
agp_put_bridge(bridge);
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -515,7 +515,7 @@ static struct timespec s3c2410_rtc_delta;
|
||||||
|
|
||||||
static int ticnt_save;
|
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 rtc_time tm;
|
||||||
struct timespec time;
|
struct timespec time;
|
||||||
|
|
|
@ -1103,7 +1103,7 @@ static int sonypi_disable(void)
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int old_camera_power;
|
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) {
|
if (level == SUSPEND_DISABLE) {
|
||||||
old_camera_power = sonypi_device.camera_power;
|
old_camera_power = sonypi_device.camera_power;
|
||||||
|
|
|
@ -567,7 +567,7 @@ static u8 savestate[] = {
|
||||||
* We are about to suspend. Save the TPM state
|
* We are about to suspend. Save the TPM state
|
||||||
* so that it can be restored.
|
* 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);
|
struct tpm_chip *chip = pci_get_drvdata(pci_dev);
|
||||||
if (chip == NULL)
|
if (chip == NULL)
|
||||||
|
|
|
@ -89,5 +89,5 @@ extern ssize_t tpm_write(struct file *, const char __user *, size_t,
|
||||||
loff_t *);
|
loff_t *);
|
||||||
extern ssize_t tpm_read(struct file *, 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 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 *);
|
extern int tpm_pm_resume(struct pci_dev *);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче