lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 5/6] acerhdf: added critical trip point
    Date
    added critical trip point which represents the temperature limit.
    Added return -EINVAL in case wrong trip point is provided.

    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Andreas Mohr <andi@lisas.de>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: Javi Merino <javi.merino@arm.com>
    Signed-off-by: Peter Feuerer <peter@piie.net>
    ---
    drivers/platform/x86/acerhdf.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
    index 7fe7dbf..91b16c8 100644
    --- a/drivers/platform/x86/acerhdf.c
    +++ b/drivers/platform/x86/acerhdf.c
    @@ -443,6 +443,10 @@ static int acerhdf_get_trip_type(struct thermal_zone_device *thermal, int trip,
    {
    if (trip == 0)
    *type = THERMAL_TRIP_ACTIVE;
    + else if (trip == 1)
    + *type = THERMAL_TRIP_CRITICAL;
    + else
    + return -EINVAL;

    return 0;
    }
    @@ -463,6 +467,10 @@ static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip,
    {
    if (trip == 0)
    *temp = fanon;
    + else if (trip == 1)
    + *temp = ACERHDF_TEMP_CRIT;
    + else
    + return -EINVAL;

    return 0;
    }
    @@ -713,7 +721,7 @@ static int acerhdf_register_thermal(void)
    if (IS_ERR(cl_dev))
    return -EINVAL;

    - thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL,
    + thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL,
    &acerhdf_dev_ops,
    &acerhdf_zone_params, 0,
    (kernelmode) ? interval*1000 : 0);
    --
    2.0.2


    \
     
     \ /
      Last update: 2014-07-22 20:41    [W:4.040 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site