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

Commit f9f41e3e authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Remove policy create/remove notifiers 



Those were added by:

commit fcd7af91 ("cpufreq: stats: handle cpufreq_unregister_driver()
and suspend/resume properly")

but aren't used anymore since:

commit 1aefc75b ("cpufreq: stats: Make the stats code non-modular").

Remove them. Also remove the redundant parameter to the respective
routines.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 566cf877

drivers/cpufreq/cpufreq.c

+5 −11
Original line number Diff line number Diff line
@@ -1078,15 +1078,11 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) 
	return NULL;

}



static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy, bool notify)

static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy)

{

	struct kobject *kobj;

	struct completion *cmp;



	if (notify)

		blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

					     CPUFREQ_REMOVE_POLICY, policy);



	down_write(&policy->rwsem);

	cpufreq_stats_free_table(policy);

	kobj = &policy->kobj;
@@ -1104,7 +1100,7 @@ static void cpufreq_policy_put_kobj(struct cpufreq_policy *policy, bool notify) 
	pr_debug("wait complete\n");

}



static void cpufreq_policy_free(struct cpufreq_policy *policy, bool notify)

static void cpufreq_policy_free(struct cpufreq_policy *policy)

{

	unsigned long flags;

	int cpu;
@@ -1117,7 +1113,7 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy, bool notify) 
		per_cpu(cpufreq_cpu_data, cpu) = NULL;

	write_unlock_irqrestore(&cpufreq_driver_lock, flags);



	cpufreq_policy_put_kobj(policy, notify);

	cpufreq_policy_put_kobj(policy);

	free_cpumask_var(policy->real_cpus);

	free_cpumask_var(policy->related_cpus);

	free_cpumask_var(policy->cpus);
@@ -1244,8 +1240,6 @@ static int cpufreq_online(unsigned int cpu) 
			goto out_exit_policy;



		cpufreq_stats_create_table(policy);

		blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

				CPUFREQ_CREATE_POLICY, policy);



		write_lock_irqsave(&cpufreq_driver_lock, flags);

		list_add(&policy->policy_list, &cpufreq_policy_list);
@@ -1282,7 +1276,7 @@ static int cpufreq_online(unsigned int cpu) 
	if (cpufreq_driver->exit)

		cpufreq_driver->exit(policy);

out_free_policy:

	cpufreq_policy_free(policy, !new_policy);

	cpufreq_policy_free(policy);

	return ret;

}
@@ -1403,7 +1397,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
	remove_cpu_dev_symlink(policy, dev);



	if (cpumask_empty(policy->real_cpus))

		cpufreq_policy_free(policy, true);

		cpufreq_policy_free(policy);

}



/**

include/linux/cpufreq.h

+0 −2
Original line number Diff line number Diff line
@@ -416,8 +416,6 @@ static inline void cpufreq_resume(void) {} 
#define CPUFREQ_ADJUST			(0)

#define CPUFREQ_NOTIFY			(1)

#define CPUFREQ_START			(2)

#define CPUFREQ_CREATE_POLICY		(3)

#define CPUFREQ_REMOVE_POLICY		(4)



#ifdef CONFIG_CPU_FREQ

int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list);