lkml.org 
[lkml]   [2020]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] thermal/core: Rename passive_delay and polling_delay with units
    Date
    Set the scene to directly store the delays under their jiffies
    form. Add to the variable name the 'ms' suffix.

    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    ---
    drivers/thermal/thermal_core.c | 10 +++++-----
    drivers/thermal/thermal_of.c | 8 ++++----
    drivers/thermal/thermal_sysfs.c | 6 +++---
    include/linux/thermal.h | 8 ++++----
    4 files changed, 16 insertions(+), 16 deletions(-)

    diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
    index 90e38cc199f4..53f55ceca220 100644
    --- a/drivers/thermal/thermal_core.c
    +++ b/drivers/thermal/thermal_core.c
    @@ -317,9 +317,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)
    mutex_lock(&tz->lock);

    if (!stop && tz->passive)
    - thermal_zone_device_set_polling(tz, tz->passive_delay);
    - else if (!stop && tz->polling_delay)
    - thermal_zone_device_set_polling(tz, tz->polling_delay);
    + thermal_zone_device_set_polling(tz, tz->passive_delay_ms);
    + else if (!stop && tz->polling_delay_ms)
    + thermal_zone_device_set_polling(tz, tz->polling_delay_ms);
    else
    thermal_zone_device_set_polling(tz, 0);

    @@ -1340,8 +1340,8 @@ thermal_zone_device_register(const char *type, int trips, int mask,
    tz->device.class = &thermal_class;
    tz->devdata = devdata;
    tz->trips = trips;
    - tz->passive_delay = passive_delay;
    - tz->polling_delay = polling_delay;
    + tz->passive_delay_ms = passive_delay;
    + tz->polling_delay_ms = polling_delay;

    /* sys I/F */
    /* Add nodes that are always present via .groups */
    diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
    index 69ef12f852b7..ebec4a8a8b5a 100644
    --- a/drivers/thermal/thermal_of.c
    +++ b/drivers/thermal/thermal_of.c
    @@ -865,14 +865,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)
    pr_err("%pOFn: missing polling-delay-passive property\n", np);
    goto free_tz;
    }
    - tz->passive_delay = prop;
    + tz->passive_delay_ms = prop;

    ret = of_property_read_u32(np, "polling-delay", &prop);
    if (ret < 0) {
    pr_err("%pOFn: missing polling-delay property\n", np);
    goto free_tz;
    }
    - tz->polling_delay = prop;
    + tz->polling_delay_ms = prop;

    /*
    * REVIST: for now, the thermal framework supports only
    @@ -1085,8 +1085,8 @@ int __init of_parse_thermal_zones(void)
    zone = thermal_zone_device_register(child->name, tz->ntrips,
    mask, tz,
    ops, tzp,
    - tz->passive_delay,
    - tz->polling_delay);
    + tz->passive_delay_ms,
    + tz->polling_delay_ms);
    if (IS_ERR(zone)) {
    pr_err("Failed to build %pOFn zone %ld\n", child,
    PTR_ERR(zone));
    diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
    index 0866e949339b..f465462d8aa1 100644
    --- a/drivers/thermal/thermal_sysfs.c
    +++ b/drivers/thermal/thermal_sysfs.c
    @@ -233,12 +233,12 @@ passive_store(struct device *dev, struct device_attribute *attr,
    return -EINVAL;

    if (state && !tz->forced_passive) {
    - if (!tz->passive_delay)
    - tz->passive_delay = 1000;
    + if (!tz->passive_delay_ms)
    + tz->passive_delay_ms = 1000;
    thermal_zone_device_rebind_exception(tz, "Processor",
    sizeof("Processor"));
    } else if (!state && tz->forced_passive) {
    - tz->passive_delay = 0;
    + tz->passive_delay_ms = 0;
    thermal_zone_device_unbind_exception(tz, "Processor",
    sizeof("Processor"));
    }
    diff --git a/include/linux/thermal.h b/include/linux/thermal.h
    index d07ea27e72a9..230d451bf335 100644
    --- a/include/linux/thermal.h
    +++ b/include/linux/thermal.h
    @@ -116,9 +116,9 @@ struct thermal_cooling_device {
    * @devdata: private pointer for device private data
    * @trips: number of trip points the thermal zone supports
    * @trips_disabled; bitmap for disabled trips
    - * @passive_delay: number of milliseconds to wait between polls when
    + * @passive_delay_ms: number of milliseconds to wait between polls when
    * performing passive cooling.
    - * @polling_delay: number of milliseconds to wait between polls when
    + * @polling_delay_ms: number of milliseconds to wait between polls when
    * checking whether trip points have been crossed (0 for
    * interrupt driven systems)
    * @temperature: current temperature. This is only for core code,
    @@ -159,8 +159,8 @@ struct thermal_zone_device {
    void *devdata;
    int trips;
    unsigned long trips_disabled; /* bitmap for disabled trips */
    - int passive_delay;
    - int polling_delay;
    + int passive_delay_ms;
    + int polling_delay_ms;
    int temperature;
    int last_temperature;
    int emul_temperature;
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-12-02 13:10    [W:6.457 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site