Skip to content

Commit

Permalink
[CPUFREQ] Factor out symlink creation from cpufreq_add_dev
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Jones <davej@redhat.com>
  • Loading branch information
Dave Jones committed Sep 1, 2009
1 parent 059019a commit 19d6f7e
Showing 1 changed file with 31 additions and 20 deletions.
51 changes: 31 additions & 20 deletions drivers/cpufreq/cpufreq.c
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,34 @@ static struct kobj_type ktype_cpufreq = {
.release = cpufreq_sysfs_release,
};

/* symlink affected CPUs */
int cpufreq_add_dev_symlink(unsigned int cpu, struct cpufreq_policy *policy)
{
unsigned int j;
int ret = 0;

for_each_cpu(j, policy->cpus) {
struct cpufreq_policy *managed_policy;
struct sys_device *cpu_sys_dev;

if (j == cpu)
continue;
if (!cpu_online(j))
continue;

dprintk("CPU %u already managed, adding link\n", j);
managed_policy = cpufreq_cpu_get(cpu);
cpu_sys_dev = get_cpu_sysdev(j);
ret = sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,
"cpufreq");
if (ret) {
cpufreq_cpu_put(managed_policy);
return ret;
}
}
return ret;
}


/**
* cpufreq_add_dev - add a CPU device
Expand Down Expand Up @@ -929,26 +957,9 @@ static int cpufreq_add_dev(struct sys_device *sys_dev)
}
spin_unlock_irqrestore(&cpufreq_driver_lock, flags);

/* symlink affected CPUs */
for_each_cpu(j, policy->cpus) {
struct cpufreq_policy *managed_policy;
struct sys_device *cpu_sys_dev;

if (j == cpu)
continue;
if (!cpu_online(j))
continue;

dprintk("CPU %u already managed, adding link\n", j);
managed_policy = cpufreq_cpu_get(cpu);
cpu_sys_dev = get_cpu_sysdev(j);
ret = sysfs_create_link(&cpu_sys_dev->kobj, &policy->kobj,
"cpufreq");
if (ret) {
cpufreq_cpu_put(managed_policy);
goto err_out_unregister;
}
}
ret = cpufreq_add_dev_symlink(cpu, policy->cpus, policy);
if (ret)
goto err_out_unregister;

policy->governor = NULL; /* to assure that the starting sequence is
* run in cpufreq_set_policy */
Expand Down

0 comments on commit 19d6f7e

Please sign in to comment.