From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>
Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
sboyd@codeaurora.org, prarit@redhat.com, skannan@codeaurora.org,
Srivatsa Bhat <srivatsa@mit.edu>,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V5 13/14] cpufreq: Call cpufreq_policy_put_kobj() from cpufreq_policy_free()
Date: Mon, 18 May 2015 10:43:36 +0530 [thread overview]
Message-ID: <9203cdc11b5d3bb62c6a01d12f75cf92bc6a0f00.1431924457.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1431924457.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1431924457.git.viresh.kumar@linaro.org>
cpufreq_policy_put_kobj() is actually part of freeing the policy and can
be called from cpufreq_policy_free() directly instead of a separate
call.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/cpufreq/cpufreq.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 1137e7942278..b030432cbfad 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1189,7 +1189,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)
+static void cpufreq_policy_free(struct cpufreq_policy *policy, bool notify)
{
unsigned long flags;
int cpu;
@@ -1202,6 +1202,7 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy)
per_cpu(cpufreq_cpu_data, cpu) = NULL;
write_unlock_irqrestore(&cpufreq_driver_lock, flags);
+ cpufreq_policy_put_kobj(policy, notify);
free_cpumask_var(policy->related_cpus);
free_cpumask_var(policy->cpus);
kfree(policy);
@@ -1387,9 +1388,7 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif)
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
err_set_policy_cpu:
- cpufreq_policy_put_kobj(policy, recover_policy);
- cpufreq_policy_free(policy);
-
+ cpufreq_policy_free(policy, recover_policy);
nomem_out:
up_read(&cpufreq_rwsem);
@@ -1484,10 +1483,6 @@ static int __cpufreq_remove_dev_finish(struct device *dev,
}
}
- /* Free the policy kobjects only if the driver is getting removed. */
- if (sif)
- cpufreq_policy_put_kobj(policy, true);
-
/*
* Perform the ->exit() even during light-weight tear-down,
* since this is a core component, and is essential for the
@@ -1496,8 +1491,9 @@ static int __cpufreq_remove_dev_finish(struct device *dev,
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
+ /* Free the policy only if the driver is getting removed. */
if (sif)
- cpufreq_policy_free(policy);
+ cpufreq_policy_free(policy, true);
return 0;
}
@@ -1534,8 +1530,7 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
if (cpumask_intersects(&mask, cpu_present_mask))
return add_remove_cpu_dev_symlink(policy, cpu, false);
- cpufreq_policy_put_kobj(policy, true);
- cpufreq_policy_free(policy);
+ cpufreq_policy_free(policy, true);
return 0;
}
--
2.4.0
next prev parent reply other threads:[~2015-05-18 5:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 5:13 [PATCH V5 00/14] cpufreq: Don't loose cpufreq history on CPU hotplug Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 01/14] cpufreq: Create for_each_{in}active_policy() Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 02/14] cpufreq: Don't clear cpufreq_cpu_data and policy list for inactive policies Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 03/14] cpufreq: Get rid of cpufreq_cpu_data_fallback Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 04/14] cpufreq: Don't traverse all active policies to find policy for a cpu Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 05/14] cpufreq: Manage governor usage history with 'policy->last_governor' Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 06/14] cpufreq: Mark policy->governor = NULL for inactive policies Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 07/14] cpufreq: Don't allow updating inactive policies from sysfs Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 08/14] cpufreq: Track cpu managing sysfs kobjects separately Viresh Kumar
2015-05-22 23:29 ` Rafael J. Wysocki
2015-05-18 5:13 ` [PATCH V5 09/14] cpufreq: add/remove sysfs links via cpufreq_add_remove_dev_symlink() Viresh Kumar
2015-05-22 23:28 ` Rafael J. Wysocki
2015-05-23 3:41 ` Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 10/14] cpufreq: Stop migrating sysfs files on hotplug Viresh Kumar
2015-05-23 3:45 ` (unknown), Viresh Kumar
2015-05-23 4:34 ` [PATCH V6 10/14] cpufreq: Remove cpufreq_update_policy() Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 11/14] " Viresh Kumar
2015-05-18 5:13 ` [PATCH V5 12/14] cpufreq: Initialize policy->kobj while allocating policy Viresh Kumar
2015-05-18 5:13 ` Viresh Kumar [this message]
2015-05-18 5:13 ` [PATCH V5 14/14] cpufreq: Restart governor as soon as possible Viresh Kumar
2015-05-19 0:34 ` [PATCH V5 00/14] cpufreq: Don't loose cpufreq history on CPU hotplug Rafael J. Wysocki
2015-05-19 2:27 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9203cdc11b5d3bb62c6a01d12f75cf92bc6a0f00.1431924457.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-pm@vger.kernel.org \
--cc=prarit@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=skannan@codeaurora.org \
--cc=srivatsa@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).