diff options
author | Bernard Blackham <bernard@blackham.com.au> | 2005-07-07 20:56:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 21:23:43 -0400 |
commit | e00d9967e3addea86dded46deefc5daec5d52e5a (patch) | |
tree | bd6f4fba60ac6173f6e8e4a61461c74c06e3fc9a /drivers/cpufreq/cpufreq.c | |
parent | 2a569579be87b5ba61f9b6c54fd5f9f307c53962 (diff) |
[PATCH] pm: fix u32 vs. pm_message_t confusion in cpufreq
Fix u32 vs pm_message_t confusion in cpufreq.
Signed-off-by: Bernard Blackham <bernard@blackham.com.au>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |