Skip to content

Commit

Permalink
cpufreq: sa11x0: Use generic cpufreq routines
Browse files Browse the repository at this point in the history
Most of the CPUFreq drivers do similar things in .exit() and .verify() routines
and .attr. So its better if we have generic routines for them which can be used
by cpufreq drivers then.

This patch uses these generic routines in the sa11x0 driver.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Viresh Kumar authored and Rafael J. Wysocki committed Oct 15, 2013
1 parent 9c3c6e3 commit dd9f263
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 25 deletions.
22 changes: 0 additions & 22 deletions arch/arm/mach-sa1100/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,28 +82,6 @@ unsigned int sa11x0_ppcr_to_freq(unsigned int idx)
return freq;
}


/* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on
* this platform, anyway.
*/
int sa11x0_verify_speed(struct cpufreq_policy *policy)
{
unsigned int tmp;
if (policy->cpu)
return -EINVAL;

cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);

/* make sure that at least one frequency is within the policy */
tmp = sa11x0_freq_table[sa11x0_freq_to_ppcr(policy->min)].frequency;
if (tmp > policy->max)
policy->max = tmp;

cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);

return 0;
}

unsigned int sa11x0_getspeed(unsigned int cpu)
{
if (cpu)
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-sa1100/generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct cpufreq_policy;

extern struct cpufreq_frequency_table sa11x0_freq_table[];
extern unsigned int sa11x0_freq_to_ppcr(unsigned int khz);
extern int sa11x0_verify_speed(struct cpufreq_policy *policy);
extern unsigned int sa11x0_getspeed(unsigned int cpu);
extern unsigned int sa11x0_ppcr_to_freq(unsigned int idx);

Expand Down
2 changes: 1 addition & 1 deletion drivers/cpufreq/sa1100-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy)

static struct cpufreq_driver sa1100_driver __refdata = {
.flags = CPUFREQ_STICKY,
.verify = sa11x0_verify_speed,
.verify = cpufreq_generic_frequency_table_verify,
.target = sa1100_target,
.get = sa11x0_getspeed,
.init = sa1100_cpu_init,
Expand Down
2 changes: 1 addition & 1 deletion drivers/cpufreq/sa1110-cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
* it with cpufreq_register_driver() */
static struct cpufreq_driver sa1110_driver __refdata = {
.flags = CPUFREQ_STICKY,
.verify = sa11x0_verify_speed,
.verify = cpufreq_generic_frequency_table_verify,
.target = sa1110_target,
.get = sa11x0_getspeed,
.init = sa1110_cpu_init,
Expand Down

0 comments on commit dd9f263

Please sign in to comment.