From: Eduardo Valentin <edubezval@gmail.com>
To: Rui Zhang <rui.zhang@intel.com>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Eduardo Valentin <edubezval@gmail.com>
Subject: [PATCH 25/31] thermal: core: move bind_tz() to where it is used
Date: Tue, 3 May 2016 23:02:39 -0700 [thread overview]
Message-ID: <1462341765-13268-26-git-send-email-edubezval@gmail.com> (raw)
In-Reply-To: <1462341765-13268-1-git-send-email-edubezval@gmail.com>
Moving the helper to closer where it is used.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
drivers/thermal/thermal_core.c | 80 +++++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index cbe9829..7182bec 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -319,46 +319,6 @@ static void __bind(struct thermal_zone_device *tz, int mask,
}
}
-static void bind_tz(struct thermal_zone_device *tz)
-{
- int i, ret;
- struct thermal_cooling_device *pos = NULL;
- const struct thermal_zone_params *tzp = tz->tzp;
-
- if (!tzp && !tz->ops->bind)
- return;
-
- mutex_lock(&thermal_list_lock);
-
- /* If there is ops->bind, try to use ops->bind */
- if (tz->ops->bind) {
- list_for_each_entry(pos, &thermal_cdev_list, node) {
- ret = tz->ops->bind(tz, pos);
- if (ret)
- print_bind_err_msg(tz, pos, ret);
- }
- goto exit;
- }
-
- if (!tzp || !tzp->tbp)
- goto exit;
-
- list_for_each_entry(pos, &thermal_cdev_list, node) {
- for (i = 0; i < tzp->num_tbps; i++) {
- if (tzp->tbp[i].cdev || !tzp->tbp[i].match)
- continue;
- if (tzp->tbp[i].match(tz, pos))
- continue;
- tzp->tbp[i].cdev = pos;
- __bind(tz, tzp->tbp[i].trip_mask, pos,
- tzp->tbp[i].binding_limits,
- tzp->tbp[i].weight);
- }
- }
-exit:
- mutex_unlock(&thermal_list_lock);
-}
-
static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
int delay)
{
@@ -1085,6 +1045,46 @@ void thermal_notify_framework(struct thermal_zone_device *tz, int trip)
}
EXPORT_SYMBOL_GPL(thermal_notify_framework);
+static void bind_tz(struct thermal_zone_device *tz)
+{
+ int i, ret;
+ struct thermal_cooling_device *pos = NULL;
+ const struct thermal_zone_params *tzp = tz->tzp;
+
+ if (!tzp && !tz->ops->bind)
+ return;
+
+ mutex_lock(&thermal_list_lock);
+
+ /* If there is ops->bind, try to use ops->bind */
+ if (tz->ops->bind) {
+ list_for_each_entry(pos, &thermal_cdev_list, node) {
+ ret = tz->ops->bind(tz, pos);
+ if (ret)
+ print_bind_err_msg(tz, pos, ret);
+ }
+ goto exit;
+ }
+
+ if (!tzp || !tzp->tbp)
+ goto exit;
+
+ list_for_each_entry(pos, &thermal_cdev_list, node) {
+ for (i = 0; i < tzp->num_tbps; i++) {
+ if (tzp->tbp[i].cdev || !tzp->tbp[i].match)
+ continue;
+ if (tzp->tbp[i].match(tz, pos))
+ continue;
+ tzp->tbp[i].cdev = pos;
+ __bind(tz, tzp->tbp[i].trip_mask, pos,
+ tzp->tbp[i].binding_limits,
+ tzp->tbp[i].weight);
+ }
+ }
+exit:
+ mutex_unlock(&thermal_list_lock);
+}
+
/**
* thermal_zone_device_register() - register a new thermal zone device
* @type: the thermal zone device type
--
2.1.4
next prev parent reply other threads:[~2016-05-04 6:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 6:02 [PATCH 00/31] thermal: reorganizing thermal core Eduardo Valentin
2016-05-04 6:02 ` [PATCH 01/31] thermal: core: prevent zones with no types to be registered Eduardo Valentin
2016-05-04 6:02 ` [PATCH 02/31] thermal: core: group thermal_zone DEVICE_ATTR's declarations Eduardo Valentin
2016-05-04 6:02 ` [PATCH 03/31] thermal: core: group device_create_file() calls that are always created Eduardo Valentin
2016-05-04 6:02 ` [PATCH 04/31] thermal: core: use dev.groups to manage always present tz attributes Eduardo Valentin
2016-05-04 6:02 ` [PATCH 05/31] thermal: core: move emul_temp creation to tz->device.groups Eduardo Valentin
2016-05-04 6:02 ` [PATCH 06/31] thermal: core: move mode attribute " Eduardo Valentin
2016-05-04 6:02 ` [PATCH 07/31] thermal: core: move passive attr " Eduardo Valentin
2016-05-04 6:02 ` [PATCH 08/31] thermal: core: move power actor code out of sysfs I/F section Eduardo Valentin
2016-05-04 6:02 ` [PATCH 09/31] thermal: core: move the trip attrs to the tz " Eduardo Valentin
2016-05-04 6:02 ` [PATCH 10/31] thermal: core: create tz->device.groups dynamically Eduardo Valentin
2016-05-04 6:02 ` [PATCH 11/31] thermal: core: move trips attributes to tz->device.groups Eduardo Valentin
2016-05-04 6:02 ` [PATCH 12/31] thermal: core: remove unnecessary device_remove() calls Eduardo Valentin
2016-05-04 6:02 ` [PATCH 13/31] thermal: core: split passive_store Eduardo Valentin
2016-05-04 6:02 ` [PATCH 14/31] thermal: core: split policy_store Eduardo Valentin
2016-05-04 6:02 ` [PATCH 15/31] thermal: core: split available_policies_show() Eduardo Valentin
2016-05-04 6:02 ` [PATCH 16/31] thermal: core: move to_thermal_zone() macro to header file Eduardo Valentin
2016-05-04 6:02 ` [PATCH 17/31] thermal: core: move thermal_zone sysfs to thermal_sysfs.c Eduardo Valentin
2016-05-04 6:02 ` [PATCH 18/31] thermal: core: move to_cooling_device macro to header file Eduardo Valentin
2016-05-04 6:02 ` [PATCH 19/31] thermal: core: move cooling device sysfs to thermal_sysfs.c Eduardo Valentin
2016-05-04 6:02 ` [PATCH 20/31] thermal: core: introduce thermal_helpers.c Eduardo Valentin
2016-05-17 13:20 ` Zhang, Rui
2016-05-17 14:40 ` Eduardo Valentin
2016-05-30 16:05 ` Eduardo Valentin
2016-05-04 6:02 ` [PATCH 21/31] thermal: core: group functions related to governor handling Eduardo Valentin
2016-05-04 6:02 ` [PATCH 22/31] thermal: core: move idr handling to device management section Eduardo Valentin
2016-05-04 6:02 ` [PATCH 23/31] thermal: core: move __unbind() helper to where it is used Eduardo Valentin
2016-05-04 6:02 ` [PATCH 24/31] thermal: core: move bind_cdev() " Eduardo Valentin
2016-05-04 6:02 ` Eduardo Valentin [this message]
2016-05-04 6:02 ` [PATCH 26/31] thermal: core: move __bind() " Eduardo Valentin
2016-05-04 6:02 ` [PATCH 27/31] thermal: core: add inline to print_bind_err_msg() Eduardo Valentin
2016-05-04 6:02 ` [PATCH 28/31] thermal: core: move notify to the zone update section Eduardo Valentin
2016-05-04 6:02 ` [PATCH 29/31] thermal: core: add a comment describing the main update loop Eduardo Valentin
2016-05-04 6:02 ` [PATCH 30/31] thermal: core: add a comment describing the power actor section Eduardo Valentin
2016-05-04 6:02 ` [PATCH 31/31] thermal: core: add a comment describing the device management section Eduardo Valentin
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=1462341765-13268-26-git-send-email-edubezval@gmail.com \
--to=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/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).