Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753888AbbDNKye (ORCPT ); Tue, 14 Apr 2015 06:54:34 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50388 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464AbbDNKyX (ORCPT ); Tue, 14 Apr 2015 06:54:23 -0400 Date: Tue, 14 Apr 2015 12:54:19 +0200 From: Sascha Hauer To: Eduardo Valentin Cc: linux-pm@vger.kernel.org, Zhang Rui , linux-kernel@vger.kernel.org, Stephen Warren , Mikko Perttunen , kernel@pengutronix.de, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 09/13] thermal: of: always set sensor related callbacks Message-ID: <20150414105419.GK4946@pengutronix.de> References: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> <1427385240-6086-10-git-send-email-s.hauer@pengutronix.de> <20150407032522.GL4648@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150407032522.GL4648@localhost.localdomain> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 12:53:50 up 28 days, 22:45, 77 users, load average: 0.04, 0.17, 0.21 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 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-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3240 Lines: 87 On Mon, Apr 06, 2015 at 08:25:23PM -0700, Eduardo Valentin wrote: > On Thu, Mar 26, 2015 at 04:53:56PM +0100, Sascha Hauer wrote: > > Now that the thermal core treats -ENOSYS like the callbacks were > > not present at all we no longer have to overwrite the ops during > > runtime but instead can always set them and return -ENOSYS if no > > sensor is registered. > > > > Signed-off-by: Sascha Hauer > > --- > > drivers/thermal/of-thermal.c | 18 +++++++++++------- > > 1 file changed, 11 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c > > index b39e22f..df14fdd 100644 > > --- a/drivers/thermal/of-thermal.c > > +++ b/drivers/thermal/of-thermal.c > > @@ -91,7 +91,7 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, > > { > > struct __thermal_zone *data = tz->devdata; > > > > - if (!data->ops->get_temp) > > + if (!data->ops) > > return -EINVAL; > > > > return data->ops->get_temp(data->sensor_data, temp); > > @@ -178,7 +178,7 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz, > > struct __thermal_zone *data = tz->devdata; > > > > if (!data->ops || !data->ops->set_emul_temp) > > - return -EINVAL; > > + return -ENOSYS; > > > > return data->ops->set_emul_temp(data->sensor_data, temp); > > } > > @@ -189,8 +189,8 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, > > struct __thermal_zone *data = tz->devdata; > > int r; > > > > - if (!data->ops->get_trend) > > - return -EINVAL; > > + if (!data->ops || !data->ops->get_trend) > > + return -ENOSYS; > > > > r = data->ops->get_trend(data->sensor_data, trip, trend); > > if (r) > > @@ -366,6 +366,10 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, > > } > > > > static struct thermal_zone_device_ops of_thermal_ops = { > > + .get_temp = of_thermal_get_temp, > > + .get_trend = of_thermal_get_trend, > > + .set_emul_temp = of_thermal_set_emul_temp, > > + > > .get_mode = of_thermal_get_mode, > > .set_mode = of_thermal_set_mode, > > > > @@ -399,13 +403,13 @@ thermal_zone_of_add_sensor(struct device_node *zone, > > if (!ops) > > return ERR_PTR(-EINVAL); > > > > + if (!ops->get_temp) > > + return ERR_PTR(-EINVAL); > > + > > mutex_lock(&tzd->lock); > > tz->ops = ops; > > tz->sensor_data = data; > > > > - tzd->ops->get_temp = of_thermal_get_temp; > > - tzd->ops->get_trend = of_thermal_get_trend; > > - tzd->ops->set_emul_temp = of_thermal_set_emul_temp; > > You may want to update the thermal_zone_of_sensor_unregister too. Ups, indeed. That hunk accidently went into a later patch. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/