From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-pm@vger.kernel.org Cc: Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com>, linux-kernel@vger.kernel.org, Stephen Warren <swarren@wwwdotorg.org>, Mikko Perttunen <mikko.perttunen@kapsi.fi>, kernel@pengutronix.de, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Brian Norris <computersforpeace@gmail.com>, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Date: Wed, 20 May 2015 15:20:38 +0200 [thread overview] Message-ID: <1432128046-12921-9-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> The thermal core uses the existence of the .get_temp, .get_trend and .set_emul_temp to detect whether this operation exists and should be used or whether it should be emulated in software. This makes problems for of-thermal which has to modify the struct thermal_zone_device_ops during runtime whenever a sensor is registered or unregistered. Let the core test for -ENOSYS from these callbacks and treat it like if the callbacks were not present. This allows of-thermal to always set the sensor related callbacks and to make struct thermal_zone_device_ops const again. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/thermal_core.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 19da022..3d8f9f9 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -413,13 +413,16 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) */ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) { - int ret = -EINVAL; + int ret; int count; int crit_temp = INT_MAX; enum thermal_trip_type type; - if (!tz || IS_ERR(tz) || !tz->ops->get_temp) - goto exit; + if (!tz || IS_ERR(tz)) + return -EINVAL; + + if (!tz->ops->get_temp) + return -ENOSYS; mutex_lock(&tz->lock); @@ -445,7 +448,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) } mutex_unlock(&tz->lock); -exit: + return ret; } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); @@ -454,10 +457,11 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) { int temp, ret, count; - if (!tz->ops->get_temp) + ret = thermal_zone_get_temp(tz, &temp); + + if (ret == -ENOSYS) return; - ret = thermal_zone_get_temp(tz, &temp); if (ret) { if (ret != -EAGAIN) dev_warn(&tz->device, @@ -783,10 +787,16 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, if (kstrtoul(buf, 10, &temperature)) return -EINVAL; - if (!tz->ops->set_emul_temp) { + if (tz->ops->set_emul_temp) + ret = tz->ops->set_emul_temp(tz, temperature); + else + ret = -ENOSYS; + + if (ret == -ENOSYS) { mutex_lock(&tz->lock); tz->emul_temperature = temperature; mutex_unlock(&tz->lock); + ret = 0; } else { ret = tz->ops->set_emul_temp(tz, temperature); } -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: s.hauer@pengutronix.de (Sascha Hauer) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Date: Wed, 20 May 2015 15:20:38 +0200 [thread overview] Message-ID: <1432128046-12921-9-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> The thermal core uses the existence of the .get_temp, .get_trend and .set_emul_temp to detect whether this operation exists and should be used or whether it should be emulated in software. This makes problems for of-thermal which has to modify the struct thermal_zone_device_ops during runtime whenever a sensor is registered or unregistered. Let the core test for -ENOSYS from these callbacks and treat it like if the callbacks were not present. This allows of-thermal to always set the sensor related callbacks and to make struct thermal_zone_device_ops const again. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/thermal_core.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 19da022..3d8f9f9 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -413,13 +413,16 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) */ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) { - int ret = -EINVAL; + int ret; int count; int crit_temp = INT_MAX; enum thermal_trip_type type; - if (!tz || IS_ERR(tz) || !tz->ops->get_temp) - goto exit; + if (!tz || IS_ERR(tz)) + return -EINVAL; + + if (!tz->ops->get_temp) + return -ENOSYS; mutex_lock(&tz->lock); @@ -445,7 +448,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) } mutex_unlock(&tz->lock); -exit: + return ret; } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); @@ -454,10 +457,11 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) { int temp, ret, count; - if (!tz->ops->get_temp) + ret = thermal_zone_get_temp(tz, &temp); + + if (ret == -ENOSYS) return; - ret = thermal_zone_get_temp(tz, &temp); if (ret) { if (ret != -EAGAIN) dev_warn(&tz->device, @@ -783,10 +787,16 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, if (kstrtoul(buf, 10, &temperature)) return -EINVAL; - if (!tz->ops->set_emul_temp) { + if (tz->ops->set_emul_temp) + ret = tz->ops->set_emul_temp(tz, temperature); + else + ret = -ENOSYS; + + if (ret == -ENOSYS) { mutex_lock(&tz->lock); tz->emul_temperature = temperature; mutex_unlock(&tz->lock); + ret = 0; } else { ret = tz->ops->set_emul_temp(tz, temperature); } -- 2.1.4
next prev parent reply other threads:[~2015-05-20 13:21 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-20 13:20 [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 01/16] thermal: consistently use int for temperatures Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 02/16] thermal: trivial: fix typo in comment Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 03/16] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 04/16] thermal: Use IS_ENABLED instead of #ifdef Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 05/16] thermal: Add comment explaining test for critical temperature Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 06/16] thermal: inline only once used function Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 07/16] thermal: streamline get_trend callbacks Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer [this message] 2015-05-20 13:20 ` [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-05-20 13:20 ` [PATCH 09/16] thermal: of: always set sensor related callbacks Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 10/16] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 11/16] thermal: bang-bang governor: act on lower trip boundary Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 12/16] thermal: thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 13/16] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 14/16] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 15/16] thermal: Add Mediatek thermal controller support Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-05-20 13:20 ` [PATCH 16/16] ARM64: dts: mt8173: Add thermal/auxadc device nodes Sascha Hauer 2015-05-20 13:20 ` Sascha Hauer 2015-06-08 6:56 ` [PATCH v4] Thermal cleanups and hardware trip points Sascha Hauer 2015-06-08 6:56 ` Sascha Hauer 2015-06-22 6:38 ` Sascha Hauer 2015-06-22 6:38 ` Sascha Hauer 2015-06-22 6:38 ` Sascha Hauer
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=1432128046-12921-9-git-send-email-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=computersforpeace@gmail.com \ --cc=edubezval@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mikko.perttunen@kapsi.fi \ --cc=rui.zhang@intel.com \ --cc=swarren@wwwdotorg.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.