|
@@ -900,46 +900,31 @@ static int cpufreq_add_dev_interface(struct cpufreq_policy *policy,
|
|
|
struct freq_attr **drv_attr;
|
|
|
int ret = 0;
|
|
|
|
|
|
- /* prepare interface data */
|
|
|
- ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,
|
|
|
- &dev->kobj, "cpufreq");
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
/* set up files for this cpu device */
|
|
|
drv_attr = cpufreq_driver->attr;
|
|
|
while ((drv_attr) && (*drv_attr)) {
|
|
|
ret = sysfs_create_file(&policy->kobj, &((*drv_attr)->attr));
|
|
|
if (ret)
|
|
|
- goto err_out_kobj_put;
|
|
|
+ return ret;
|
|
|
drv_attr++;
|
|
|
}
|
|
|
if (cpufreq_driver->get) {
|
|
|
ret = sysfs_create_file(&policy->kobj, &cpuinfo_cur_freq.attr);
|
|
|
if (ret)
|
|
|
- goto err_out_kobj_put;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
ret = sysfs_create_file(&policy->kobj, &scaling_cur_freq.attr);
|
|
|
if (ret)
|
|
|
- goto err_out_kobj_put;
|
|
|
+ return ret;
|
|
|
|
|
|
if (cpufreq_driver->bios_limit) {
|
|
|
ret = sysfs_create_file(&policy->kobj, &bios_limit.attr);
|
|
|
if (ret)
|
|
|
- goto err_out_kobj_put;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
- ret = cpufreq_add_dev_symlink(policy);
|
|
|
- if (ret)
|
|
|
- goto err_out_kobj_put;
|
|
|
-
|
|
|
- return ret;
|
|
|
-
|
|
|
-err_out_kobj_put:
|
|
|
- kobject_put(&policy->kobj);
|
|
|
- wait_for_completion(&policy->kobj_unregister);
|
|
|
- return ret;
|
|
|
+ return cpufreq_add_dev_symlink(policy);
|
|
|
}
|
|
|
|
|
|
static void cpufreq_init_policy(struct cpufreq_policy *policy)
|
|
@@ -1198,6 +1183,8 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
|
|
|
goto err_set_policy_cpu;
|
|
|
}
|
|
|
|
|
|
+ down_write(&policy->rwsem);
|
|
|
+
|
|
|
/* related cpus should atleast have policy->cpus */
|
|
|
cpumask_or(policy->related_cpus, policy->related_cpus, policy->cpus);
|
|
|
|
|
@@ -1210,9 +1197,17 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
|
|
|
if (!recover_policy) {
|
|
|
policy->user_policy.min = policy->min;
|
|
|
policy->user_policy.max = policy->max;
|
|
|
+
|
|
|
+ /* prepare interface data */
|
|
|
+ ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq,
|
|
|
+ &dev->kobj, "cpufreq");
|
|
|
+ if (ret) {
|
|
|
+ pr_err("%s: failed to init policy->kobj: %d\n",
|
|
|
+ __func__, ret);
|
|
|
+ goto err_init_policy_kobj;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- down_write(&policy->rwsem);
|
|
|
write_lock_irqsave(&cpufreq_driver_lock, flags);
|
|
|
for_each_cpu(j, policy->cpus)
|
|
|
per_cpu(cpufreq_cpu_data, j) = policy;
|
|
@@ -1303,6 +1298,11 @@ err_get_freq:
|
|
|
per_cpu(cpufreq_cpu_data, j) = NULL;
|
|
|
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
|
|
|
|
|
|
+ if (!recover_policy) {
|
|
|
+ kobject_put(&policy->kobj);
|
|
|
+ wait_for_completion(&policy->kobj_unregister);
|
|
|
+ }
|
|
|
+err_init_policy_kobj:
|
|
|
up_write(&policy->rwsem);
|
|
|
|
|
|
if (cpufreq_driver->exit)
|