lkml.org 
[lkml]   [2016]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 32/40] thermal: core: move bind_tz() to where it is used
    Date
    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 e0ebf9f..b71f4ea 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)
    {
    @@ -1086,6 +1046,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
    \
     
     \ /
      Last update: 2016-05-31 00:01    [W:4.203 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site