* [PATCH] cpufreq: Drop unnecessary arguments from two functions
@ 2015-07-22 2:09 Rafael J. Wysocki
2015-07-22 6:46 ` Viresh Kumar
2015-07-22 17:48 ` [PATCH v2] " Rafael J. Wysocki
0 siblings, 2 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2015-07-22 2:09 UTC (permalink / raw)
To: Linux PM list, Viresh Kumar; +Cc: Linux Kernel Mailing List
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
The second sif argument of __cpufreq_remove_dev_prepare() is
never used by it, so drop it.
The second sif argument of __cpufreq_remove_dev_finish() is only
used for one check that is not necessary if the policy is freed
by cpufreq_remove_dev() itself, so make cpufreq_remove_dev() free
the policy and drop the __cpufreq_remove_dev_finish()'s second
argument too.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/cpufreq/cpufreq.c | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
Index: linux-pm/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq.c
+++ linux-pm/drivers/cpufreq/cpufreq.c
@@ -1421,8 +1421,7 @@ out_release_rwsem:
return ret;
}
-static int __cpufreq_remove_dev_prepare(struct device *dev,
- struct subsys_interface *sif)
+static int __cpufreq_remove_dev_prepare(struct device *dev)
{
unsigned int cpu = dev->id;
int ret = 0;
@@ -1474,8 +1473,7 @@ static int __cpufreq_remove_dev_prepare(
return ret;
}
-static int __cpufreq_remove_dev_finish(struct device *dev,
- struct subsys_interface *sif)
+static int __cpufreq_remove_dev_finish(struct device *dev)
{
unsigned int cpu = dev->id;
int ret;
@@ -1507,10 +1505,6 @@ static int __cpufreq_remove_dev_finish(s
if (cpufreq_driver->exit)
cpufreq_driver->exit(policy);
- /* Free the policy only if the driver is getting removed. */
- if (sif)
- cpufreq_policy_free(policy, true);
-
return 0;
}
@@ -1522,6 +1516,7 @@ static int __cpufreq_remove_dev_finish(s
static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
{
unsigned int cpu = dev->id;
+ struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
int ret;
/*
@@ -1530,7 +1525,6 @@ static int cpufreq_remove_dev(struct dev
* link or free policy here.
*/
if (cpu_is_offline(cpu)) {
- struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
struct cpumask mask;
if (!policy)
@@ -1547,17 +1541,18 @@ static int cpufreq_remove_dev(struct dev
remove_cpu_dev_symlink(policy, cpu);
return 0;
}
+ } else {
+ ret = __cpufreq_remove_dev_prepare(dev);
+ if (!ret)
+ ret = __cpufreq_remove_dev_finish(dev);
- cpufreq_policy_free(policy, true);
- return 0;
+ /* The CPU is online, so the policy cannot be inactive here. */
+ if (ret)
+ return ret;
}
- ret = __cpufreq_remove_dev_prepare(dev, sif);
-
- if (!ret)
- ret = __cpufreq_remove_dev_finish(dev, sif);
-
- return ret;
+ cpufreq_policy_free(policy, true);
+ return 0;
}
static void handle_update(struct work_struct *work)
@@ -2396,11 +2391,11 @@ static int cpufreq_cpu_callback(struct n
break;
case CPU_DOWN_PREPARE:
- __cpufreq_remove_dev_prepare(dev, NULL);
+ __cpufreq_remove_dev_prepare(dev);
break;
case CPU_POST_DEAD:
- __cpufreq_remove_dev_finish(dev, NULL);
+ __cpufreq_remove_dev_finish(dev);
break;
case CPU_DOWN_FAILED:
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] cpufreq: Drop unnecessary arguments from two functions
2015-07-22 2:09 [PATCH] cpufreq: Drop unnecessary arguments from two functions Rafael J. Wysocki
@ 2015-07-22 6:46 ` Viresh Kumar
2015-07-22 17:48 ` [PATCH v2] " Rafael J. Wysocki
1 sibling, 0 replies; 4+ messages in thread
From: Viresh Kumar @ 2015-07-22 6:46 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM list, Linux Kernel Mailing List
On 22-07-15, 04:09, Rafael J. Wysocki wrote:
> static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
> {
> unsigned int cpu = dev->id;
> + struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
> int ret;
>
> /*
> @@ -1530,7 +1525,6 @@ static int cpufreq_remove_dev(struct dev
> * link or free policy here.
> */
> if (cpu_is_offline(cpu)) {
> - struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
> struct cpumask mask;
>
> if (!policy)
> @@ -1547,17 +1541,18 @@ static int cpufreq_remove_dev(struct dev
> remove_cpu_dev_symlink(policy, cpu);
> return 0;
> }
> + } else {
> + ret = __cpufreq_remove_dev_prepare(dev);
> + if (!ret)
> + ret = __cpufreq_remove_dev_finish(dev);
>
> - cpufreq_policy_free(policy, true);
> - return 0;
> + /* The CPU is online, so the policy cannot be inactive here. */
> + if (ret)
> + return ret;
> }
>
> - ret = __cpufreq_remove_dev_prepare(dev, sif);
> -
> - if (!ret)
> - ret = __cpufreq_remove_dev_finish(dev, sif);
> -
> - return ret;
> + cpufreq_policy_free(policy, true);
You need to check for policy_is_inactive(policy) before freeing
policy. cpufreq_remove_dev() will be called one by one for all CPUs of
a policy ..
--
viresh
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] cpufreq: Drop unnecessary arguments from two functions
2015-07-22 2:09 [PATCH] cpufreq: Drop unnecessary arguments from two functions Rafael J. Wysocki
2015-07-22 6:46 ` Viresh Kumar
@ 2015-07-22 17:48 ` Rafael J. Wysocki
2015-07-22 20:15 ` Rafael J. Wysocki
1 sibling, 1 reply; 4+ messages in thread
From: Rafael J. Wysocki @ 2015-07-22 17:48 UTC (permalink / raw)
To: Linux PM list, Viresh Kumar; +Cc: Linux Kernel Mailing List
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: cpufreq: Drop unnecessary arguments from two functions
After commit 9b07109f06a1 (cpufreq: Fix double addition of sysfs
links) The second sif argument of __cpufreq_remove_dev_prepare()
and __cpufreq_remove_dev_finish() is not used by them any more,
so drop it.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Rebased on top of:
http://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=9b07109f06a1edd6e636b1e7397157eae0e6baa4
Note: The above commit is on a testing branch only at the moment.
---
drivers/cpufreq/cpufreq.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
Index: linux-pm/drivers/cpufreq/cpufreq.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq.c
+++ linux-pm/drivers/cpufreq/cpufreq.c
@@ -1376,8 +1376,7 @@ out_release_rwsem:
return ret;
}
-static int __cpufreq_remove_dev_prepare(struct device *dev,
- struct subsys_interface *sif)
+static int __cpufreq_remove_dev_prepare(struct device *dev)
{
unsigned int cpu = dev->id;
int ret = 0;
@@ -1429,8 +1428,7 @@ static int __cpufreq_remove_dev_prepare(
return ret;
}
-static int __cpufreq_remove_dev_finish(struct device *dev,
- struct subsys_interface *sif)
+static int __cpufreq_remove_dev_finish(struct device *dev)
{
unsigned int cpu = dev->id;
int ret;
@@ -1480,9 +1478,9 @@ static int cpufreq_remove_dev(struct dev
return 0;
if (cpu_online(cpu)) {
- ret = __cpufreq_remove_dev_prepare(dev, sif);
+ ret = __cpufreq_remove_dev_prepare(dev);
if (!ret)
- ret = __cpufreq_remove_dev_finish(dev, sif);
+ ret = __cpufreq_remove_dev_finish(dev);
if (ret)
return ret;
}
@@ -2376,11 +2374,11 @@ static int cpufreq_cpu_callback(struct n
break;
case CPU_DOWN_PREPARE:
- __cpufreq_remove_dev_prepare(dev, NULL);
+ __cpufreq_remove_dev_prepare(dev);
break;
case CPU_POST_DEAD:
- __cpufreq_remove_dev_finish(dev, NULL);
+ __cpufreq_remove_dev_finish(dev);
break;
case CPU_DOWN_FAILED:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-22 19:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-22 2:09 [PATCH] cpufreq: Drop unnecessary arguments from two functions Rafael J. Wysocki
2015-07-22 6:46 ` Viresh Kumar
2015-07-22 17:48 ` [PATCH v2] " Rafael J. Wysocki
2015-07-22 20:15 ` Rafael J. Wysocki
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).