[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1406043436-17068-6-git-send-email-peter@piie.net>
Date: Tue, 22 Jul 2014 17:37:15 +0200
From: Peter Feuerer <peter@...e.net>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Peter Feuerer <peter@...e.net>,
Andrew Morton <akpm@...ux-foundation.org>,
Andreas Mohr <andi@...as.de>, Borislav Petkov <bp@...e.de>,
Javi Merino <javi.merino@....com>
Subject: [PATCH v5 5/6] acerhdf: added critical trip point
added critical trip point which represents the temperature limit.
Added return -EINVAL in case wrong trip point is provided.
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andreas Mohr <andi@...as.de>
Cc: Borislav Petkov <bp@...e.de>
Cc: Javi Merino <javi.merino@....com>
Signed-off-by: Peter Feuerer <peter@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists