From: Peter Feuerer <peter@piie.net>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Peter Feuerer <peter@piie.net>,
Andrew Morton <akpm@linux-foundation.org>,
Andreas Mohr <andi@lisas.de>, Borislav Petkov <bp@suse.de>,
Javi Merino <javi.merino@arm.com>
Subject: [PATCH v4 5/6] acerhdf: added critical trip point
Date: Sun, 20 Jul 2014 02:51:19 +0200 [thread overview]
Message-ID: <1405817480-25347-6-git-send-email-peter@piie.net> (raw)
In-Reply-To: <1405817480-25347-1-git-send-email-peter@piie.net>
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 e8c3111..0d521ea 100644
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -444,6 +444,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;
}
@@ -464,6 +468,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;
}
@@ -714,7 +722,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
next prev parent reply other threads:[~2014-07-20 0:51 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-27 1:23 [PATCH 0/4] acerhdf/thermal: adding new models and appropriate governor Peter Feuerer
2014-04-27 1:23 ` [PATCH 1/4] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-04-27 21:03 ` Borislav Petkov
2014-04-27 22:22 ` Peter Feuerer
2014-04-27 1:23 ` [PATCH 2/4] acerhdf: Adding support for new models Peter Feuerer
2014-04-27 1:23 ` [PATCH 3/4] thermal: Added Bang-bang thermal governor Peter Feuerer
2014-04-27 1:23 ` [PATCH 4/4] acerhdf: Use bang-bang " Peter Feuerer
2014-04-27 18:57 ` [PATCH 0/4] acerhdf/thermal: adding new models and appropriate governor Andreas Mohr
2014-04-27 23:13 ` Peter Feuerer
2014-04-28 4:58 ` Andreas Mohr
2014-04-29 9:17 ` [PATCH v2 " Peter Feuerer
2014-04-29 9:17 ` [PATCH v2 1/4] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-04-29 9:17 ` [PATCH v2 2/4] acerhdf: Adding support for new models Peter Feuerer
2014-04-29 9:17 ` [PATCH v2 3/4] thermal: Added Bang-bang thermal governor Peter Feuerer
2014-04-29 15:53 ` Javi Merino
2014-04-29 16:37 ` Peter Feuerer
2014-04-29 21:31 ` Peter Feuerer
2014-04-30 9:01 ` Javi Merino
2014-04-29 9:17 ` [PATCH v2 4/4] acerhdf: Use bang-bang " Peter Feuerer
2014-04-29 16:00 ` Javi Merino
2014-04-29 16:43 ` Peter Feuerer
2014-05-01 18:36 ` [PATCH v2 0/4] acerhdf/thermal: adding new models and appropriate governor Peter Feuerer
2014-05-03 17:59 ` [PATCH v3 0/6] acerhdf/thermal: adding new models, appropriate governor and minor clean up Peter Feuerer
2014-05-03 17:59 ` [PATCH v3 1/6] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-07-17 9:44 ` Borislav Petkov
2014-05-03 17:59 ` [PATCH v3 2/6] acerhdf: Adding support for new models Peter Feuerer
2014-07-17 9:46 ` Borislav Petkov
2014-07-18 16:06 ` Peter Feuerer
2014-07-18 16:17 ` Borislav Petkov
2014-07-18 16:25 ` Peter Feuerer
2014-05-03 17:59 ` [PATCH v3 3/6] thermal: Added Bang-bang thermal governor Peter Feuerer
2014-07-17 9:58 ` Borislav Petkov
2014-07-18 16:24 ` Peter Feuerer
2014-05-03 17:59 ` [PATCH v3 4/6] acerhdf: Use bang-bang " Peter Feuerer
2014-05-06 10:50 ` Javi Merino
2014-05-12 10:27 ` Peter Feuerer
2014-05-12 12:03 ` Javi Merino
2014-05-03 17:59 ` [PATCH v3 5/6] acerhdf: added critical trip point Peter Feuerer
2014-05-03 17:59 ` [PATCH v3 6/6] acerhdf: minor clean up Peter Feuerer
2014-07-17 10:12 ` Borislav Petkov
2014-05-15 16:05 ` [PATCH v3 0/6] acerhdf/thermal: adding new models, appropriate governor and " Eduardo Valentin
2014-05-15 22:53 ` Peter Feuerer
2014-06-15 22:39 ` Felix Deichmann
2014-07-30 13:16 ` Eduardo Valentin
2014-07-16 22:24 ` Borislav Petkov
2014-07-16 22:34 ` Peter Feuerer
2014-07-17 8:46 ` Borislav Petkov
2014-07-20 0:51 ` [PATCH v4 " Peter Feuerer
2014-07-20 0:51 ` [PATCH v4 1/6] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-07-20 8:04 ` Andreas Mohr
2014-07-20 10:42 ` Peter Feuerer
2014-07-20 20:20 ` Andreas Mohr
2014-07-20 0:51 ` [PATCH v4 2/6] acerhdf: Adding support for new models Peter Feuerer
2014-07-20 0:51 ` [PATCH v4 3/6] thermal: Added Bang-bang thermal governor Peter Feuerer
2014-07-21 9:29 ` Borislav Petkov
2014-07-21 9:37 ` Zhang Rui
2014-07-21 9:40 ` Zhang Rui
2014-07-22 14:59 ` Peter Feuerer
2014-07-22 16:09 ` Borislav Petkov
2014-07-20 0:51 ` [PATCH v4 4/6] acerhdf: Use bang-bang " Peter Feuerer
2014-07-21 10:23 ` Borislav Petkov
2014-07-20 0:51 ` Peter Feuerer [this message]
2014-07-20 0:51 ` [PATCH v4 6/6] acerhdf: minor clean up Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 0/6] acerhdf/thermal: adding new models, appropriate governor and " Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 1/6] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 2/6] acerhdf: Adding support for new models Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 3/6] thermal: Added Bang-bang thermal governor Peter Feuerer
2014-07-26 14:14 ` Peter Feuerer
2014-07-28 2:26 ` Zhang Rui
2014-10-21 10:29 ` Peter Feuerer
2014-10-28 19:33 ` Peter Feuerer
2014-10-29 9:44 ` Javi Merino
2014-10-29 10:14 ` Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 4/6] acerhdf: Use bang-bang " Peter Feuerer
2014-08-27 7:48 ` Zhang Rui
2014-08-27 8:01 ` Peter Feuerer
2014-08-28 1:17 ` Zhang Rui
2014-08-28 6:05 ` Borislav Petkov
2014-07-22 15:37 ` [PATCH v5 5/6] acerhdf: added critical trip point Peter Feuerer
2014-07-26 14:16 ` Peter Feuerer
2014-07-22 15:37 ` [PATCH v5 6/6] acerhdf: minor clean up Peter Feuerer
2014-11-28 14:20 ` [RESEND PATCH v5 0/5] acerhdf: adding new models, appropriate governor and " Peter Feuerer
2014-11-28 14:20 ` [RESEND PATCH v5 1/5] acerhdf: Adding support for "manual mode" Peter Feuerer
2014-11-28 14:20 ` [RESEND PATCH v5 2/5] acerhdf: Adding support for new models Peter Feuerer
2014-11-28 14:20 ` [RESEND PATCH v5 3/5] acerhdf: Use bang-bang thermal governor Peter Feuerer
2014-12-03 9:04 ` Darren Hart
2014-12-04 7:10 ` Peter Feuerer
2014-12-04 7:21 ` Peter Feuerer
2014-12-04 11:40 ` Darren Hart
2014-12-08 7:45 ` Peter Feuerer
2014-12-04 11:18 ` Darren Hart
2014-11-28 14:20 ` [RESEND PATCH v5 4/5] acerhdf: added critical trip point Peter Feuerer
2014-12-03 9:08 ` Darren Hart
2014-11-28 14:20 ` [RESEND PATCH v5 5/5] acerhdf: minor clean up Peter Feuerer
2014-12-03 21:46 ` [RESEND PATCH v5 0/5] acerhdf: adding new models, appropriate governor and " Peter Feuerer
2014-12-11 4:27 ` Darren Hart
2014-12-11 4:59 ` Darren Hart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405817480-25347-6-git-send-email-peter@piie.net \
--to=peter@piie.net \
--cc=akpm@linux-foundation.org \
--cc=andi@lisas.de \
--cc=bp@suse.de \
--cc=javi.merino@arm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).