From patchwork Wed May 20 13:20:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 6446051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 843E79F318 for ; Wed, 20 May 2015 13:24:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACE532034E for ; Wed, 20 May 2015 13:24:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D385F20306 for ; Wed, 20 May 2015 13:24:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv3wM-0007yH-DS; Wed, 20 May 2015 13:21:42 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Yv3wI-0007tq-F8 for linux-arm-kernel@lists.infradead.org; Wed, 20 May 2015 13:21:39 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Yv3vp-0004kw-81; Wed, 20 May 2015 15:21:09 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1Yv3vn-0006iW-6x; Wed, 20 May 2015 15:21:07 +0200 From: Sascha Hauer To: linux-pm@vger.kernel.org Subject: [PATCH 08/16] thermal: Allow sensor ops to fail with -ENOSYS Date: Wed, 20 May 2015 15:20:38 +0200 Message-Id: <1432128046-12921-9-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> References: <1432128046-12921-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150520_062138_770343_D55D390E X-CRM114-Status: GOOD ( 17.62 ) X-Spam-Score: -0.0 (/) Cc: Stephen Warren , Sascha Hauer , linux-kernel@vger.kernel.org, Eduardo Valentin , Mikko Perttunen , linux-mediatek@lists.infradead.org, kernel@pengutronix.de, Zhang Rui , Brian Norris , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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); }