Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ca64e2d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Dave Jones
Browse files

[CPUFREQ] Remove the pm_message_t argument from driver suspend 



None of the existing cpufreq drivers uses the second argument of
its .suspend() callback (which isn't useful anyway), so remove it.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 326c86de

arch/arm/mach-s5pv210/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static int s5pv210_target(struct cpufreq_policy *policy, 
}



#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;

}

arch/arm/mach-s5pv310/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -458,8 +458,7 @@ static int s5pv310_target(struct cpufreq_policy *policy, 
}



#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;

}

arch/arm/plat-s3c24xx/cpu-freq.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int s3c_cpufreq_verify(struct cpufreq_policy *policy) 
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);

arch/powerpc/platforms/powermac/cpufreq_32.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static u32 read_gpio(struct device_node *np) 
	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

drivers/cpufreq/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ static int cpufreq_suspend(struct sys_device *sysdev, pm_message_t pmsg) 
		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);