From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615AbbDNKss (ORCPT ); Tue, 14 Apr 2015 06:48:48 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50296 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753264AbbDNKsk (ORCPT ); Tue, 14 Apr 2015 06:48:40 -0400 Date: Tue, 14 Apr 2015 12:48:36 +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 06/13] thermal: streamline get_trend callbacks Message-ID: <20150414104836.GJ4946@pengutronix.de> References: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> <1427385240-6086-7-git-send-email-s.hauer@pengutronix.de> <20150407031950.GK4648@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150407031950.GK4648@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:44:53 up 28 days, 22:36, 77 users, load average: 0.25, 0.21, 0.20 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 On Mon, Apr 06, 2015 at 08:19:52PM -0700, Eduardo Valentin wrote: > On Thu, Mar 26, 2015 at 04:53:53PM +0100, Sascha Hauer wrote: > > The .get_trend callback in struct thermal_zone_device_ops has the prototype: > > > > int (*get_trend) (struct thermal_zone_device *, int, > > enum thermal_trend *); > > > > whereas the .get_trend callback in struct thermal_zone_of_device_ops has: > > > > int (*get_trend)(void *, long *); > > > > Streamline both prototypes and add the trip argument to the OF callback > > aswell and use enum thermal_trend * instead of an integer pointer. > > > > While the OF prototype may be the better one, this should be decided at > > framework level and not on OF level. > > > > Signed-off-by: Sascha Hauer > > --- > > drivers/thermal/of-thermal.c | 11 +--------- > > drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 25 +++++++--------------- > > include/linux/thermal.h | 2 +- > > 3 files changed, 10 insertions(+), 28 deletions(-) > > > > diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c > > index 668fb1b..b39e22f 100644 > > --- a/drivers/thermal/of-thermal.c > > +++ b/drivers/thermal/of-thermal.c > > @@ -187,24 +187,15 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, > > enum thermal_trend *trend) > > { > > struct __thermal_zone *data = tz->devdata; > > - long dev_trend; > > int r; > > > > if (!data->ops->get_trend) > > return -EINVAL; > > > > - r = data->ops->get_trend(data->sensor_data, &dev_trend); > > + r = data->ops->get_trend(data->sensor_data, trip, trend); > > if (r) > > return r; > > > > - /* TODO: These intervals might have some thresholds, but in core code */ > > - if (dev_trend > 0) > > - *trend = THERMAL_TREND_RAISING; > > - else if (dev_trend < 0) > > - *trend = THERMAL_TREND_DROPPING; > > - else > > - *trend = THERMAL_TREND_STABLE; > > - > > return 0; > > } > > > > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > index a38c175..7f8e5f3 100644 > > --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c > > @@ -238,7 +238,7 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal, > > return 0; > > } > > > > -static int __ti_thermal_get_trend(void *p, long *trend) > > +static int __ti_thermal_get_trend(void *p, int trip, enum thermal_trend *trend) > > { > > struct ti_thermal_data *data = p; > > struct ti_bandgap *bgp; > > @@ -251,22 +251,6 @@ static int __ti_thermal_get_trend(void *p, long *trend) > > if (ret) > > return ret; > > > > - *trend = tr; > > - > > - return 0; > > -} > > - > > -/* Get the temperature trend callback functions for thermal zone */ > > -static int ti_thermal_get_trend(struct thermal_zone_device *thermal, > > - int trip, enum thermal_trend *trend) > > -{ > > - int ret; > > - long tr; > > - > > - ret = __ti_thermal_get_trend(thermal->devdata, &tr); > > - if (ret) > > - return ret; > > - > > if (tr > 0) > > *trend = THERMAL_TREND_RAISING; > > else if (tr < 0) > > @@ -277,6 +261,13 @@ static int ti_thermal_get_trend(struct thermal_zone_device *thermal, > > return 0; > > } > > > > +/* Get the temperature trend callback functions for thermal zone */ > > +static int ti_thermal_get_trend(struct thermal_zone_device *thermal, > > + int trip, enum thermal_trend *trend) > > +{ > > + return __ti_thermal_get_trend(thermal->devdata, trip, trend); > > +} > > + > > /* Get critical temperature callback functions for thermal zone */ > > static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal, > > unsigned long *temp) > > diff --git a/include/linux/thermal.h b/include/linux/thermal.h > > index db6c12b..ba2e29a 100644 > > --- a/include/linux/thermal.h > > +++ b/include/linux/thermal.h > > @@ -273,7 +273,7 @@ struct thermal_genl_event { > > */ > > struct thermal_zone_of_device_ops { > > int (*get_temp)(void *, long *); > > - int (*get_trend)(void *, long *); > > + int (*get_trend)(void *, int trend, enum thermal_trend *); > > Could you please keep the kernel doc entry up to date? What do you mean? The kernel doc entry for this function contains: * @get_trend: a pointer to a function that reads the sensor temperature trend. This is still valid with my patch, so I might not understand what I should keep up to date. That said, the argument name above should be 'int trip', not 'int trend'. I'll change that. 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 |