lkml.org 
[lkml]   [2022]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/9] thermal/core: Remove thermal_zone_set_trips()
    Date
    Since no callers of thermal_zone_set_trips() are left, remove the function.
    Document __thermal_zone_set_trips() instead. Explicitly state that the
    thermal zone lock must be held when calling the function, and that the
    pointer to the thermal zone must be valid.

    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    ---
    drivers/thermal/thermal_core.h | 1 -
    drivers/thermal/thermal_helpers.c | 34 ++++++++++++++-----------------
    2 files changed, 15 insertions(+), 20 deletions(-)

    diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
    index 7b51b9a22e7e..b834cb273429 100644
    --- a/drivers/thermal/thermal_core.h
    +++ b/drivers/thermal/thermal_core.h
    @@ -113,7 +113,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
    enum thermal_notify_event event);

    /* Helpers */
    -void thermal_zone_set_trips(struct thermal_zone_device *tz);
    void __thermal_zone_set_trips(struct thermal_zone_device *tz);
    int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);

    diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
    index 0161d5fb1cf2..02b353c8d9aa 100644
    --- a/drivers/thermal/thermal_helpers.c
    +++ b/drivers/thermal/thermal_helpers.c
    @@ -147,6 +147,21 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
    }
    EXPORT_SYMBOL_GPL(thermal_zone_get_temp);

    +/**
    + * __thermal_zone_set_trips - Computes the next trip points for the driver
    + * @tz: a pointer to a thermal zone device structure
    + *
    + * The function computes the next temperature boundaries by browsing
    + * the trip points. The result is the closer low and high trip points
    + * to the current temperature. These values are passed to the backend
    + * driver to let it set its own notification mechanism (usually an
    + * interrupt).
    + *
    + * This function must be called with tz->lock held. Both tz and tz->ops
    + * must be valid pointers.
    + *
    + * It does not return a value
    + */
    void __thermal_zone_set_trips(struct thermal_zone_device *tz)
    {
    int low = -INT_MAX;
    @@ -193,25 +208,6 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz)
    dev_err(&tz->device, "Failed to set trips: %d\n", ret);
    }

    -/**
    - * thermal_zone_set_trips - Computes the next trip points for the driver
    - * @tz: a pointer to a thermal zone device structure
    - *
    - * The function computes the next temperature boundaries by browsing
    - * the trip points. The result is the closer low and high trip points
    - * to the current temperature. These values are passed to the backend
    - * driver to let it set its own notification mechanism (usually an
    - * interrupt).
    - *
    - * It does not return a value
    - */
    -void thermal_zone_set_trips(struct thermal_zone_device *tz)
    -{
    - mutex_lock(&tz->lock);
    - __thermal_zone_set_trips(tz);
    - mutex_unlock(&tz->lock);
    -}
    -
    static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,
    int target)
    {
    --
    2.36.2
    \
     
     \ /
      Last update: 2022-10-17 15:11    [W:2.560 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site