cpufreq: Remove the pm_message_t argument from driver suspend

Commit Message

Rafael Wysocki March 10, 2011, 8:13 p.m. UTC

None

Patch

Index: linux-2.6/include/linux/cpufreq.h
===================================================================
--- linux-2.6.orig/include/linux/cpufreq.h
+++ linux-2.6/include/linux/cpufreq.h
@@ -230,7 +230,7 @@  struct cpufreq_driver {
 	int	(*bios_limit)	(int cpu, unsigned int *limit);
 
 	int	(*exit)		(struct cpufreq_policy *policy);
-	int	(*suspend)	(struct cpufreq_policy *policy, pm_message_t pmsg);
+	int	(*suspend)	(struct cpufreq_policy *policy);
 	int	(*resume)	(struct cpufreq_policy *policy);
 	struct freq_attr	**attr;
 };
Index: linux-2.6/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-2.6.orig/drivers/cpufreq/cpufreq.c
+++ linux-2.6/drivers/cpufreq/cpufreq.c
@@ -1371,7 +1371,7 @@  static int cpufreq_suspend(struct sys_de
 		goto out;
 
 	if (cpufreq_driver->suspend) {
-		ret = cpufreq_driver->suspend(cpu_policy, pmsg);
+		ret = cpufreq_driver->suspend(cpu_policy);
 		if (ret)
 			printk(KERN_ERR "cpufreq: suspend failed in ->suspend "
 					"step on CPU %u\n", cpu_policy->cpu);
Index: linux-2.6/arch/powerpc/platforms/powermac/cpufreq_32.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ linux-2.6/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -429,7 +429,7 @@  static u32 read_gpio(struct device_node
 	return offset;
 }
 
-static int pmac_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)
+static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)
 {
 	/* 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
Index: linux-2.6/arch/arm/mach-s5pv210/cpufreq.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-s5pv210/cpufreq.c
+++ linux-2.6/arch/arm/mach-s5pv210/cpufreq.c
@@ -390,8 +390,7 @@  static int s5pv210_target(struct cpufreq
 }
 
 #ifdef CONFIG_PM
-static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy,
-				   pm_message_t pmsg)
+static int s5pv210_cpufreq_suspend(struct cpufreq_policy *policy)
 {
 	return 0;
 }
Index: linux-2.6/arch/arm/mach-s5pv310/cpufreq.c
===================================================================
--- linux-2.6.orig/arch/arm/mach-s5pv310/cpufreq.c
+++ linux-2.6/arch/arm/mach-s5pv310/cpufreq.c
@@ -458,8 +458,7 @@  static int s5pv310_target(struct cpufreq
 }
 
 #ifdef CONFIG_PM
-static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy,
-				   pm_message_t pmsg)
+static int s5pv310_cpufreq_suspend(struct cpufreq_policy *policy)
 {
 	return 0;
 }
Index: linux-2.6/arch/arm/plat-s3c24xx/cpu-freq.c
===================================================================
--- linux-2.6.orig/arch/arm/plat-s3c24xx/cpu-freq.c
+++ linux-2.6/arch/arm/plat-s3c24xx/cpu-freq.c
@@ -433,7 +433,7 @@  static int s3c_cpufreq_verify(struct cpu
 static struct cpufreq_frequency_table suspend_pll;
 static unsigned int suspend_freq;
 
-static int s3c_cpufreq_suspend(struct cpufreq_policy *policy, pm_message_t pmsg)
+static int s3c_cpufreq_suspend(struct cpufreq_policy *policy)
 {
 	suspend_pll.frequency = clk_get_rate(_clk_mpll);
 	suspend_pll.index = __raw_readl(S3C2410_MPLLCON);