From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Juri Lelli <juri.lelli@arm.com>,
Steve Muckle <steve.muckle@linaro.org>,
Saravana Kannan <skannan@codeaurora.org>
Subject: [PATCH v2 6/10] cpufreq: governor: Rework cpufreq_governor_dbs()
Date: Fri, 05 Feb 2016 03:18:26 +0100 [thread overview]
Message-ID: <41589956.sxJrHjYhQ2@vostro.rjw.lan> (raw)
In-Reply-To: <9008098.QDD8C89zDx@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since it is possible to obtain a pointer to struct dbs_governor
from a pointer to the struct governor embedded in it via
container_of(), the second argument of cpufreq_governor_init()
is not necessary. Accordingly, cpufreq_governor_dbs() doesn't
need its second argument either and the ->governor callbacks
for both the ondemand and conservative governors may be set
to cpufreq_governor_dbs() directly. Make that happen.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Saravana Kannan <skannan@codeaurora.org>
---
drivers/cpufreq/cpufreq_conservative.c | 11 +----------
drivers/cpufreq/cpufreq_governor.c | 10 +++++-----
drivers/cpufreq/cpufreq_governor.h | 3 +--
drivers/cpufreq/cpufreq_ondemand.c | 11 +----------
4 files changed, 8 insertions(+), 27 deletions(-)
Index: linux-pm/drivers/cpufreq/cpufreq_conservative.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_conservative.c
+++ linux-pm/drivers/cpufreq/cpufreq_conservative.c
@@ -325,13 +325,10 @@ static void cs_exit(struct dbs_data *dbs
define_get_cpu_dbs_routines(cs_cpu_dbs_info);
-static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
- unsigned int event);
-
static struct dbs_governor cs_dbs_gov = {
.gov = {
.name = "conservative",
- .governor = cs_cpufreq_governor_dbs,
+ .governor = cpufreq_governor_dbs,
.max_transition_latency = TRANSITION_LATENCY_LIMIT,
.owner = THIS_MODULE,
},
@@ -348,12 +345,6 @@ static struct dbs_governor cs_dbs_gov =
#define CPU_FREQ_GOV_CONSERVATIVE (&cs_dbs_gov.gov)
-static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy,
- unsigned int event)
-{
- return cpufreq_governor_dbs(policy, &cs_dbs_gov, event);
-}
-
static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void *data)
{
Index: linux-pm/drivers/cpufreq/cpufreq_governor.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_governor.c
+++ linux-pm/drivers/cpufreq/cpufreq_governor.c
@@ -324,9 +324,10 @@ static void free_common_dbs_info(struct
kfree(shared);
}
-static int cpufreq_governor_init(struct cpufreq_policy *policy,
- struct dbs_governor *gov)
+static int cpufreq_governor_init(struct cpufreq_policy *policy)
{
+ struct dbs_governor *gov = container_of(policy->governor,
+ struct dbs_governor, gov);
struct dbs_data *dbs_data = gov->gdbs_data;
unsigned int latency;
int ret;
@@ -537,8 +538,7 @@ static int cpufreq_governor_limits(struc
return 0;
}
-int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- struct dbs_governor *gov, unsigned int event)
+int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event)
{
int ret = -EINVAL;
@@ -546,7 +546,7 @@ int cpufreq_governor_dbs(struct cpufreq_
mutex_lock(&dbs_data_mutex);
if (event == CPUFREQ_GOV_POLICY_INIT) {
- ret = cpufreq_governor_init(policy, gov);
+ ret = cpufreq_governor_init(policy);
} else if (policy->governor_data) {
switch (event) {
case CPUFREQ_GOV_POLICY_EXIT:
Index: linux-pm/drivers/cpufreq/cpufreq_governor.h
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_governor.h
+++ linux-pm/drivers/cpufreq/cpufreq_governor.h
@@ -276,8 +276,7 @@ void gov_set_update_util(struct cpu_comm
unsigned int delay_us);
void gov_cancel_work(struct cpu_common_dbs_info *shared);
void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
-int cpufreq_governor_dbs(struct cpufreq_policy *policy,
- struct dbs_governor *gov, unsigned int event);
+int cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event);
void od_register_powersave_bias_handler(unsigned int (*f)
(struct cpufreq_policy *, unsigned int, unsigned int),
unsigned int powersave_bias);
Index: linux-pm/drivers/cpufreq/cpufreq_ondemand.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_ondemand.c
+++ linux-pm/drivers/cpufreq/cpufreq_ondemand.c
@@ -535,13 +535,10 @@ static struct od_ops od_ops = {
.freq_increase = dbs_freq_increase,
};
-static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
- unsigned int event);
-
static struct dbs_governor od_dbs_gov = {
.gov = {
.name = "ondemand",
- .governor = od_cpufreq_governor_dbs,
+ .governor = cpufreq_governor_dbs,
.max_transition_latency = TRANSITION_LATENCY_LIMIT,
.owner = THIS_MODULE,
},
@@ -559,12 +556,6 @@ static struct dbs_governor od_dbs_gov =
#define CPU_FREQ_GOV_ONDEMAND (&od_dbs_gov.gov)
-static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy,
- unsigned int event)
-{
- return cpufreq_governor_dbs(policy, &od_dbs_gov, event);
-}
-
static void od_set_powersave_bias(unsigned int powersave_bias)
{
struct cpufreq_policy *policy;
next prev parent reply other threads:[~2016-02-05 2:21 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-03 23:12 [PATCH 0/11] cpufreq: governor: ondemand/conservative data structures rework Rafael J. Wysocki
2016-02-03 23:14 ` [PATCH 1/11] cpufreq: Clean up default and fallback governor setup Rafael J. Wysocki
2016-02-04 0:55 ` Saravana Kannan
2016-02-04 5:03 ` Viresh Kumar
2016-02-03 23:16 ` [PATCH 2/11] cpufreq: governor: Use common mutex for dbs_data protection Rafael J. Wysocki
2016-02-04 0:59 ` Saravana Kannan
2016-02-04 5:09 ` Viresh Kumar
2016-02-04 16:46 ` Rafael J. Wysocki
2016-02-05 2:59 ` Viresh Kumar
2016-02-05 3:06 ` Rafael J. Wysocki
2016-02-05 3:15 ` Rafael J. Wysocki
2016-02-05 3:17 ` Rafael J. Wysocki
2016-02-05 3:24 ` Viresh Kumar
2016-02-05 3:33 ` Rafael J. Wysocki
2016-02-05 3:22 ` Viresh Kumar
2016-02-03 23:22 ` [PATCH 3/11] cpufreq: governor: Use common global_dbs_data pointer Rafael J. Wysocki
2016-02-04 1:11 ` Saravana Kannan
2016-02-04 1:25 ` Rafael J. Wysocki
2016-02-04 1:40 ` Saravana Kannan
2016-02-04 5:38 ` Viresh Kumar
2016-02-04 1:47 ` Saravana Kannan
2016-02-04 5:36 ` Viresh Kumar
[not found] ` <CAHZ_5WxJSDtFyFdCc-D2=HSaPON=3rzUxpxPYsCyZvrV1Nv3qw@mail.gmail.com>
2016-02-04 8:25 ` Viresh Kumar
2016-02-04 11:31 ` Gautham R Shenoy
2016-02-04 11:35 ` Viresh Kumar
2016-02-04 16:52 ` Rafael J. Wysocki
2016-02-05 3:02 ` Viresh Kumar
2016-02-05 3:10 ` Rafael J. Wysocki
2016-02-03 23:29 ` [PATCH 4/11] cpufreq: governor: Avoid passing dbs_data pointers around unnecessarily Rafael J. Wysocki
2016-02-04 1:37 ` Saravana Kannan
2016-02-03 23:31 ` [PATCH 5/11] cpufreq: governor: Put governor structure into common_dbs_data Rafael J. Wysocki
2016-02-04 1:57 ` Saravana Kannan
2016-02-03 23:32 ` [PATCH 6/11] cpufreq: governor: Rename some data types and variables Rafael J. Wysocki
2016-02-03 23:33 ` [PATCH 7/11] cpufreq: governor: Rework cpufreq_governor_dbs() Rafael J. Wysocki
2016-02-04 2:03 ` Saravana Kannan
2016-02-03 23:35 ` [PATCH 8/11] cpufreq: governor: Drop the gov pointer from struct dbs_data Rafael J. Wysocki
2016-02-03 23:35 ` [PATCH 9/11] cpufreq: governor: Rename cpu_common_dbs_info to policy_dbs_info Rafael J. Wysocki
2016-02-03 23:37 ` [PATCH 10/11] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-03 23:38 ` [PATCH 11/11] cpufreq: governor: Drop cpu argument from dbs_check_cpu() Rafael J. Wysocki
2016-02-04 5:40 ` [PATCH 0/11] cpufreq: governor: ondemand/conservative data structures rework Viresh Kumar
2016-02-04 17:22 ` Rafael J. Wysocki
2016-02-05 2:07 ` [PATCH v2 0/10] " Rafael J. Wysocki
2016-02-05 2:11 ` [PATCH v2 1/10] cpufreq: Clean up default and fallback governor setup Rafael J. Wysocki
2016-02-10 5:15 ` Gautham R Shenoy
2016-02-10 5:48 ` Gautham R Shenoy
2016-02-05 2:14 ` [PATCH v2 2/10] cpufreq: governor: Use common mutex for dbs_data protection Rafael J. Wysocki
2016-02-05 6:53 ` Viresh Kumar
2016-02-05 22:59 ` Rafael J. Wysocki
2016-02-07 9:31 ` Viresh Kumar
2016-02-07 14:33 ` Rafael J. Wysocki
2016-02-05 2:15 ` [PATCH v2 3/10] cpufreq: governor: Avoid passing dbs_data pointers around unnecessarily Rafael J. Wysocki
2016-02-05 7:09 ` Viresh Kumar
2016-02-05 2:16 ` [PATCH v2 4/10] cpufreq: governor: Put governor structure into common_dbs_data Rafael J. Wysocki
2016-02-05 7:13 ` Viresh Kumar
2016-02-05 2:17 ` [PATCH v2 5/10] cpufreq: governor: Rename some data types and variables Rafael J. Wysocki
2016-02-05 7:17 ` Viresh Kumar
2016-02-05 2:18 ` Rafael J. Wysocki [this message]
2016-02-05 8:14 ` [PATCH v2 6/10] cpufreq: governor: Rework cpufreq_governor_dbs() Viresh Kumar
2016-02-05 2:19 ` [PATCH v2 7/10] cpufreq: governor: Drop the gov pointer from struct dbs_data Rafael J. Wysocki
2016-02-05 8:28 ` Viresh Kumar
2016-02-05 2:20 ` [PATCH v2 8/10] cpufreq: governor: Rename cpu_common_dbs_info to policy_dbs_info Rafael J. Wysocki
2016-02-05 8:34 ` Viresh Kumar
2016-02-05 22:50 ` Rafael J. Wysocki
2016-02-06 12:48 ` [PATCH v3 " Rafael J. Wysocki
2016-02-07 9:31 ` Viresh Kumar
2016-02-05 2:21 ` [PATCH v2 9/10] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-05 9:13 ` Viresh Kumar
2016-02-05 22:47 ` Rafael J. Wysocki
2016-02-07 9:29 ` Viresh Kumar
2016-02-07 14:34 ` Rafael J. Wysocki
2016-02-05 2:21 ` [PATCH v2 10/10] cpufreq: governor: Drop cpu argument from dbs_check_cpu() Rafael J. Wysocki
2016-02-05 9:15 ` Viresh Kumar
2016-02-06 12:50 ` [PATCH v3 " Rafael J. Wysocki
2016-02-07 9:32 ` Viresh Kumar
2016-02-06 12:44 ` [PATCH v2 0/10] cpufreq: governor: ondemand/conservative data structures rework Rafael J. Wysocki
2016-02-07 15:22 ` [PATCH 0/3] cpufreq: governor: Data structure rearrangement Rafael J. Wysocki
2016-02-07 15:23 ` [PATCH 1/3] cpufreq: governor: Simplify cpufreq_governor_limits() Rafael J. Wysocki
2016-02-07 15:40 ` Viresh Kumar
2016-02-08 0:59 ` Rafael J. Wysocki
2016-02-07 15:24 ` [PATCH 2/3] cpufreq: governor: Rearrange governor data structures Rafael J. Wysocki
2016-02-07 15:45 ` Viresh Kumar
2016-02-07 15:54 ` Viresh Kumar
2016-02-07 15:55 ` Viresh Kumar
2016-02-07 15:25 ` [PATCH 3/3] cpufreq: governor: Symmetrize cpu_dbs_info initialization and cleanup Rafael J. Wysocki
2016-02-07 15:52 ` 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=41589956.sxJrHjYhQ2@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=juri.lelli@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=skannan@codeaurora.org \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=steve.muckle@linaro.org \
--cc=viresh.kumar@linaro.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).