From: Alex Shi <alex.shi@linaro.org>
To: mark.hambleton@broadcom.com, mark.brown@linaro.org,
eduardo.valentin@ti.com, mporter@linaro.org,
lsk-interest@linaro.org, linaro-kernel@linaro.org
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Shi <alex.shi@linaro.org>
Subject: [PATCH 01/19] thermal: allow registering without .get_temp
Date: Tue, 25 Mar 2014 18:49:14 +0800 [thread overview]
Message-ID: <1395744572-20014-2-git-send-email-alex.shi@linaro.org> (raw)
In-Reply-To: <1395744572-20014-1-git-send-email-alex.shi@linaro.org>
From: Eduardo Valentin <eduardo.valentin@ti.com>
This patch changes the thermal core driver to allow
registration of thermal zones without the .get_temp callback.
The idea behind this change is to allow lazy registration
of sensor callbacks.
The thermal zone will be disabled whenever the ops
does not contain a .get_temp callback. The sysfs interface
will be returning -EINVAL on any temperature read operation.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
(cherry picked from commit 81bd4e1cebed5efb85bd94a15342ee4d6965a416)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
---
drivers/thermal/thermal_core.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d755440..818cd78 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -388,7 +388,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp)
enum thermal_trip_type type;
#endif
- if (!tz || IS_ERR(tz))
+ if (!tz || IS_ERR(tz) || !tz->ops->get_temp)
goto exit;
mutex_lock(&tz->lock);
@@ -441,6 +441,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
{
int count;
+ if (!tz->ops->get_temp)
+ return;
+
update_temperature(tz);
for (count = 0; count < tz->trips; count++)
@@ -1621,7 +1624,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips)
return ERR_PTR(-EINVAL);
- if (!ops || !ops->get_temp)
+ if (!ops)
return ERR_PTR(-EINVAL);
if (trips > 0 && !ops->get_trip_type)
@@ -1723,6 +1726,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
INIT_DELAYED_WORK(&(tz->poll_queue), thermal_zone_device_check);
+ if (!tz->ops->get_temp)
+ thermal_zone_device_set_polling(tz, 0);
+
thermal_zone_device_update(tz);
if (!result)
--
1.8.1.2
next parent reply other threads:[~2014-03-25 10:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1395744572-20014-1-git-send-email-alex.shi@linaro.org>
2014-03-25 10:49 ` Alex Shi [this message]
2014-03-26 2:23 ` Zhang Rui
2014-03-26 2:30 ` Alex Shi
2014-03-25 10:49 ` [PATCH 02/19] thermal: hwmon: move hwmon support to single file Alex Shi
2014-03-25 10:49 ` [PATCH 03/19] drivers: thermal: make usage of CONFIG_THERMAL_HWMON optional Alex Shi
2014-03-25 10:49 ` [PATCH 04/19] thermal: introduce device tree parser Alex Shi
2014-03-25 10:49 ` [PATCH 05/19] thermal: core: introduce thermal_of_cooling_device_register Alex Shi
2014-03-25 10:49 ` [PATCH 06/19] thermal: cpu_cooling: introduce of_cpufreq_cooling_register Alex Shi
2014-03-25 10:49 ` [PATCH 07/19] hwmon: lm75: expose to thermal fw via DT nodes Alex Shi
2014-03-25 13:32 ` [lm-sensors] " Guenter Roeck
2014-03-25 10:49 ` [PATCH 08/19] hwmon: tmp102: " Alex Shi
2014-03-25 10:49 ` [PATCH 09/19] arm: dts: add omap4 CPU thermal data Alex Shi
2014-03-25 10:49 ` [PATCH 10/19] arm: dts: add cooling properties on omap4430 cpu node Alex Shi
2014-05-06 15:20 ` Tony Lindgren
2014-03-25 10:49 ` [PATCH 11/19] arm: dts: add cooling properties on omap4460 " Alex Shi
2014-03-25 10:49 ` [PATCH 12/19] arm: dts: add omap5 GPU thermal data Alex Shi
2014-03-25 10:49 ` [PATCH 13/19] arm: dts: add omap5 CORE " Alex Shi
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=1395744572-20014-2-git-send-email-alex.shi@linaro.org \
--to=alex.shi@linaro.org \
--cc=eduardo.valentin@ti.com \
--cc=linaro-kernel@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lsk-interest@linaro.org \
--cc=mark.brown@linaro.org \
--cc=mark.hambleton@broadcom.com \
--cc=mporter@linaro.org \
--cc=rui.zhang@intel.com \
/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
all inboxes | Powered by JetHome®