From: Eduardo Valentin <edubezval@gmail.com> To: Sascha Hauer <s.hauer@pengutronix.de> Cc: linux-pm@vger.kernel.org, Zhang Rui <rui.zhang@intel.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 Subject: Re: [PATCH 06/13] thermal: streamline get_trend callbacks Date: Mon, 6 Apr 2015 20:19:52 -0700 [thread overview] Message-ID: <20150407031950.GK4648@localhost.localdomain> (raw) In-Reply-To: <1427385240-6086-7-git-send-email-s.hauer@pengutronix.de> [-- Attachment #1: Type: text/plain, Size: 4224 bytes --] 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 <s.hauer@pengutronix.de> > --- > 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? Apart from that, looks good to me. > int (*set_emul_temp)(void *, unsigned long); > }; > > -- > 2.1.4 > [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 490 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: edubezval@gmail.com (Eduardo Valentin) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/13] thermal: streamline get_trend callbacks Date: Mon, 6 Apr 2015 20:19:52 -0700 [thread overview] Message-ID: <20150407031950.GK4648@localhost.localdomain> (raw) In-Reply-To: <1427385240-6086-7-git-send-email-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> > --- > 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? Apart from that, looks good to me. > int (*set_emul_temp)(void *, unsigned long); > }; > > -- > 2.1.4 > -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 490 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150406/71e18521/attachment.sig>
next prev parent reply other threads:[~2015-04-07 3:19 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-26 15:53 Thermal: Cleanups, fixes and hardware trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 01/13] thermal: Make temperatures consistently unsigned long Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 19:07 ` Sascha Hauer 2015-03-27 19:07 ` Sascha Hauer 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-27 20:36 ` Pavel Machek 2015-04-27 20:36 ` Pavel Machek 2015-04-28 7:42 ` Sascha Hauer 2015-04-28 7:42 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 02/13] thermal: trivial: fix typo in comment Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 1:49 ` Eduardo Valentin 2015-04-07 1:49 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 03/13] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:56 ` Eduardo Valentin 2015-04-07 2:56 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 04/13] thermal: Fix not emulating critical temperatures Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:55 ` Sascha Hauer 2015-03-26 18:55 ` Sascha Hauer 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 5:23 ` Sascha Hauer 2015-03-27 5:23 ` Sascha Hauer 2015-04-07 2:08 ` Eduardo Valentin 2015-04-07 2:08 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 05/13] thermal: inline only once used function Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:23 ` Eduardo Valentin 2015-04-07 2:23 ` Eduardo Valentin 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 06/13] thermal: streamline get_trend callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:19 ` Eduardo Valentin [this message] 2015-04-07 3:19 ` Eduardo Valentin 2015-04-14 10:48 ` Sascha Hauer 2015-04-14 10:48 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 07/13] thermal: of: streamline .get_temp callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:27 ` Eduardo Valentin 2015-04-07 2:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 08/13] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 09/13] thermal: of: always set sensor related callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:25 ` Eduardo Valentin 2015-04-07 3:25 ` Eduardo Valentin 2015-04-14 10:54 ` Sascha Hauer 2015-04-14 10:54 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 10/13] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:29 ` Eduardo Valentin 2015-04-07 3:29 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 11/13] thermal: of: make of_thermal_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:27 ` Eduardo Valentin 2015-04-07 3:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 12/13] thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:40 ` Eduardo Valentin 2015-04-07 2:40 ` Eduardo Valentin 2015-04-15 18:06 ` Brian Norris 2015-04-15 18:06 ` Brian Norris 2015-03-26 15:54 ` [PATCH 13/13] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-03-26 15:54 ` Sascha Hauer 2015-04-07 2:43 ` Eduardo Valentin 2015-04-07 2:43 ` Eduardo Valentin 2015-04-13 6:30 ` Sascha Hauer 2015-04-13 6:30 ` Sascha Hauer 2015-04-15 17:59 ` Brian Norris 2015-04-15 17:59 ` Brian Norris 2015-04-17 5:22 ` Sascha Hauer 2015-04-17 5:22 ` 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=20150407031950.GK4648@localhost.localdomain \ --to=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=s.hauer@pengutronix.de \ --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.