Commit e00d9967 authored by Bernard Blackham's avatar Bernard Blackham Committed by Linus Torvalds
Browse files

[PATCH] pm: fix u32 vs. pm_message_t confusion in cpufreq

Fix u32 vs pm_message_t confusion in cpufreq.
Signed-off-by: default avatarBernard Blackham <>
Signed-off-by: default avatarPavel Machek <>
Cc: Dave Jones <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 2a569579
......@@ -452,7 +452,7 @@ static u32 __pmac read_gpio(struct device_node *np)
return offset;
static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, u32 state)
static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)
/* Ok, this could be made a bit smarter, but let's be robust for now. We
* always force a speed change to high speed before sleep, to make sure
......@@ -869,7 +869,7 @@ EXPORT_SYMBOL(cpufreq_get);
* cpufreq_suspend - let the low level driver prepare for suspend
static int cpufreq_suspend(struct sys_device * sysdev, u32 state)
static int cpufreq_suspend(struct sys_device * sysdev, pm_message_t pmsg)
int cpu = sysdev->id;
unsigned int ret = 0;
......@@ -897,7 +897,7 @@ static int cpufreq_suspend(struct sys_device * sysdev, u32 state)
if (cpufreq_driver->suspend) {
ret = cpufreq_driver->suspend(cpu_policy, state);
ret = cpufreq_driver->suspend(cpu_policy, pmsg);
if (ret) {
printk(KERN_ERR "cpufreq: suspend failed in ->suspend "
"step on CPU %u\n", cpu_policy->cpu);
......@@ -201,7 +201,7 @@ struct cpufreq_driver {
/* optional */
int (*exit) (struct cpufreq_policy *policy);
int (*suspend) (struct cpufreq_policy *policy, u32 state);
int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg);
int (*resume) (struct cpufreq_policy *policy);
struct freq_attr **attr;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment