diff options
-rw-r--r-- | arch/ppc/platforms/pmac_cpufreq.c | 2 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 | ||||
-rw-r--r-- | include/linux/cpufreq.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/platforms/pmac_cpufreq.c b/arch/ppc/platforms/pmac_cpufreq.c index 5fdd4f607a40..c0605244edda 100644 --- a/arch/ppc/platforms/pmac_cpufreq.c +++ b/arch/ppc/platforms/pmac_cpufreq.c | |||
@@ -452,7 +452,7 @@ static u32 __pmac read_gpio(struct device_node *np) | |||
452 | return offset; | 452 | return offset; |
453 | } | 453 | } |
454 | 454 | ||
455 | static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, u32 state) | 455 | static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg) |
456 | { | 456 | { |
457 | /* Ok, this could be made a bit smarter, but let's be robust for now. We | 457 | /* Ok, this could be made a bit smarter, but let's be robust for now. We |
458 | * always force a speed change to high speed before sleep, to make sure | 458 | * always force a speed change to high speed before sleep, to make sure |
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index bf62dfe4976a..7a7859dd0d98 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -869,7 +869,7 @@ EXPORT_SYMBOL(cpufreq_get); | |||
869 | * cpufreq_suspend - let the low level driver prepare for suspend | 869 | * cpufreq_suspend - let the low level driver prepare for suspend |
870 | */ | 870 | */ |
871 | 871 | ||
872 | static int cpufreq_suspend(struct sys_device * sysdev, u32 state) | 872 | static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg) |
873 | { | 873 | { |
874 | int cpu = sysdev->id; | 874 | int cpu = sysdev->id; |
875 | unsigned int ret = 0; | 875 | unsigned int ret = 0; |
@@ -897,7 +897,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, u32 state) | |||
897 | } | 897 | } |
898 | 898 | ||
899 | if (cpufreq_driver->suspend) { | 899 | if (cpufreq_driver->suspend) { |
900 | ret = cpufreq_driver->suspend(cpu_policy, state); | 900 | ret = cpufreq_driver->suspend(cpu_policy, pmsg); |
901 | if (ret) { | 901 | if (ret) { |
902 | printk(KERN_ERR "cpufreq: suspend failed in ->suspend " | 902 | printk(KERN_ERR "cpufreq: suspend failed in ->suspend " |
903 | "step on CPU %u\n", cpu_policy->cpu); | 903 | "step on CPU %u\n", cpu_policy->cpu); |
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 927daa86c9b3..ff7f80f48df1 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h | |||
@@ -201,7 +201,7 @@ struct cpufreq_driver { | |||
201 | 201 | ||
202 | /* optional */ | 202 | /* optional */ |
203 | int (*exit) (struct cpufreq_policy *policy); | 203 | int (*exit) (struct cpufreq_policy *policy); |
204 | int (*suspend) (struct cpufreq_policy *policy, u32 state); | 204 | int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg); |
205 | int (*resume) (struct cpufreq_policy *policy); | 205 | int (*resume) (struct cpufreq_policy *policy); |
206 | struct freq_attr **attr; | 206 | struct freq_attr **attr; |
207 | }; | 207 | }; |