On 02/19/2015 03:32 AM, Viresh Kumar wrote:
cpufreq_add_dev() is an unnecessary wrapper over __cpufreq_add_dev(). Merge them.
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org
drivers/cpufreq/cpufreq.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index fc51b8fbb0b0..4884caf92bff 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -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) {
@@ -2328,7 +2323,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:
@@ -2340,7 +2335,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;
Acked-by: Saravana Kannan skannan@codeaurora.org
-Saravana