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

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

cpufreq: Merge __cpufreq_add_dev() and cpufreq_add_dev() 



cpufreq_add_dev() is an unnecessary wrapper over __cpufreq_add_dev(). Merge
them.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarSaravana Kannan <skannan@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 50e9c852

drivers/cpufreq/cpufreq.c

+12 −17
Original line number Diff line number Diff line
@@ -1125,7 +1125,16 @@ static int update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu, 
	return 0;

}



static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)

/**

 * cpufreq_add_dev - add a CPU device

 *

 * Adds the cpufreq interface for a CPU device.

 *

 * The Oracle says: try running cpufreq registration/unregistration concurrently

 * with with cpu hotplugging and all hell will break loose. Tried to clean this

 * mess up, but more thorough testing is needed. - Mathieu

 */

static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)

{

	unsigned int j, cpu = dev->id;

	int ret = -ENOMEM;
@@ -1336,20 +1345,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) 
	return ret;

}



/**

 * cpufreq_add_dev - add a CPU device

 *

 * Adds the cpufreq interface for a CPU device.

 *

 * The Oracle says: try running cpufreq registration/unregistration concurrently

 * with with cpu hotplugging and all hell will break loose. Tried to clean this

 * mess up, but more thorough testing is needed. - Mathieu

 */

static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)

{

	return __cpufreq_add_dev(dev, sif);

}



static int __cpufreq_remove_dev_prepare(struct device *dev,

					struct subsys_interface *sif)

{
@@ -2331,7 +2326,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, 
	if (dev) {

		switch (action & ~CPU_TASKS_FROZEN) {

		case CPU_ONLINE:

			__cpufreq_add_dev(dev, NULL);

			cpufreq_add_dev(dev, NULL);

			break;



		case CPU_DOWN_PREPARE:
@@ -2343,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, 
			break;



		case CPU_DOWN_FAILED:

			__cpufreq_add_dev(dev, NULL);

			cpufreq_add_dev(dev, NULL);

			break;

		}

	}