|
@@ -412,7 +412,7 @@ show_one(scaling_min_freq, min);
|
|
|
show_one(scaling_max_freq, max);
|
|
|
show_one(scaling_cur_freq, cur);
|
|
|
|
|
|
-static int __cpufreq_set_policy(struct cpufreq_policy *policy,
|
|
|
+static int cpufreq_set_policy(struct cpufreq_policy *policy,
|
|
|
struct cpufreq_policy *new_policy);
|
|
|
|
|
|
/**
|
|
@@ -433,7 +433,7 @@ static ssize_t store_##file_name \
|
|
|
if (ret != 1) \
|
|
|
return -EINVAL; \
|
|
|
\
|
|
|
- ret = __cpufreq_set_policy(policy, &new_policy); \
|
|
|
+ ret = cpufreq_set_policy(policy, &new_policy); \
|
|
|
policy->user_policy.object = policy->object; \
|
|
|
\
|
|
|
return ret ? ret : count; \
|
|
@@ -491,11 +491,7 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
|
|
|
&new_policy.governor))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- /*
|
|
|
- * Do not use cpufreq_set_policy here or the user_policy.max
|
|
|
- * will be wrongly overridden
|
|
|
- */
|
|
|
- ret = __cpufreq_set_policy(policy, &new_policy);
|
|
|
+ ret = cpufreq_set_policy(policy, &new_policy);
|
|
|
|
|
|
policy->user_policy.policy = policy->policy;
|
|
|
policy->user_policy.governor = policy->governor;
|
|
@@ -837,11 +833,11 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy)
|
|
|
int ret = 0;
|
|
|
|
|
|
memcpy(&new_policy, policy, sizeof(*policy));
|
|
|
- /* assure that the starting sequence is run in __cpufreq_set_policy */
|
|
|
+ /* assure that the starting sequence is run in cpufreq_set_policy */
|
|
|
policy->governor = NULL;
|
|
|
|
|
|
/* set default policy */
|
|
|
- ret = __cpufreq_set_policy(policy, &new_policy);
|
|
|
+ ret = cpufreq_set_policy(policy, &new_policy);
|
|
|
policy->user_policy.policy = policy->policy;
|
|
|
policy->user_policy.governor = policy->governor;
|
|
|
|
|
@@ -1846,10 +1842,10 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu)
|
|
|
EXPORT_SYMBOL(cpufreq_get_policy);
|
|
|
|
|
|
/*
|
|
|
- * data : current policy.
|
|
|
- * policy : policy to be set.
|
|
|
+ * policy : current policy.
|
|
|
+ * new_policy: policy to be set.
|
|
|
*/
|
|
|
-static int __cpufreq_set_policy(struct cpufreq_policy *policy,
|
|
|
+static int cpufreq_set_policy(struct cpufreq_policy *policy,
|
|
|
struct cpufreq_policy *new_policy)
|
|
|
{
|
|
|
int ret = 0, failed = 1;
|
|
@@ -1995,7 +1991,7 @@ int cpufreq_update_policy(unsigned int cpu)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ret = __cpufreq_set_policy(policy, &new_policy);
|
|
|
+ ret = cpufreq_set_policy(policy, &new_policy);
|
|
|
|
|
|
unlock_policy_rwsem_write(cpu);
|
|
|
|